Perfecting IoTSlave for C++; Found one issue with SSH/Java process execution in which...

[iot2.git] / iotjava / iotruntime / cpp / iotslave / ObjectFactory.hpp

diff --git a/iotjava/iotruntime/cpp/iotslave/ObjectFactory.hpp b/iotjava/iotruntime/cpp/iotslave/ObjectFactory.hpp
index ee547583ff57e57e452c40dc9822955880f87e80..4ed07a71115952ea6d752d1238d9686f814c6e71 100644 (file)
--- a/iotjava/iotruntime/cpp/iotslave/ObjectFactory.hpp
+++ b/iotjava/iotruntime/cpp/iotslave/ObjectFactory.hpp
@@ -1,11 +1,30 @@
 #include "LifxLightBulb.cpp"
 #include "LightBulb_Skeleton.cpp"
 #include "LightBulbTest_Stub.cpp"
+#include "IoTSet.hpp"
 
 
-typedef void* create_t(string className, void** params);
-typedef void destroy_t(void*);
+//typedef void* create_t(string className, void** params);
+//typedef void destroy_t(void*);
 
+
+// Transferring members of IoTSet<void*> into IoTSet<IoTDeviceAddress*>
+IoTSet<IoTDeviceAddress*>* createDeviceAddressSet(unordered_set<void*>* iotSet) {
+
+       unordered_set<IoTDeviceAddress*>* devSet = new unordered_set<IoTDeviceAddress*>();
+       //for (auto itr = iotSet->begin(); itr != iotSet->end(); ++itr) {
+       for (unordered_set<void*>::const_iterator itr = iotSet->begin(); itr != iotSet->end(); ++itr) {
+               IoTDeviceAddress* deviceAddress = (IoTDeviceAddress*) *itr;
+               devSet->insert(deviceAddress);
+       }
+       IoTSet<IoTDeviceAddress*>* iotDevSet = new IoTSet<IoTDeviceAddress*>(devSet);
+
+       delete iotSet;
+       return iotDevSet;
+}
+
+
+/*
 // External creator/destroyer
 extern "C" void* create(string className, void** params) {
 
@@ -47,39 +66,5 @@ extern "C" void destroy(string className, void* ob) {
                }
        }
 }
-
-/*typedef LifxLightBulb* create_t(IoTSet<IoTDeviceAddress*>* _devAddress, string macAddress);
-typedef void destroy_t(LifxLightBulb*);
-
-// External creator/destroyer
-extern "C" LifxLightBulb* create(IoTSet<IoTDeviceAddress*>* _devAddress, string macAddress) {
-       return new LifxLightBulb(_devAddress, macAddress);
-}
-
-extern "C" void destroy(LifxLightBulb* t) {
-       delete t;
-}*/
-
-//typedef LightBulb_Skeleton* create_t(LightBulb *_mainObj, string _callbackAddress, int _port);
-//typedef void destroy_t(LightBulb_Skeleton*);
-
-/*extern "C" LightBulb_Skeleton* create(LightBulb *_mainObj, string _callbackAddress, int _port) {
-       return new LightBulb_Skeleton(_mainObj, _callbackAddress, _port);
-}
-
-extern "C" void destroy(LightBulb_Skeleton* t) {
-       delete t;
-}*/
-
-//typedef LightBulbTest_Stub* create_t(int _port, const char* _skeletonAddress, string _callbackAddress, int _rev, bool* _bResult, vector<int> _ports);
-//typedef void destroy_t(LightBulbTest_Stub*);
-
-/*extern "C" LightBulbTest_Stub* create(int _port, const char* _skeletonAddress, string _callbackAddress, int _rev, bool* _bResult, vector<int> _ports) {
-       return new LightBulbTest_Stub(_port, _skeletonAddress, _callbackAddress, _rev, _bResult, _ports);
-}
-
-extern "C" void destroy(LightBulbTest_Stub* t) {
-       delete t;
-}*/
-
+*/