Testing callbacks for Java and C++; fixing a few bugs; more bugs to tackle: 1) Need...

[iot2.git] / iotjava / iotrmi / C++ / basics / TestClass.hpp

diff --git a/iotjava/iotrmi/C++/basics/TestClass.hpp b/iotjava/iotrmi/C++/basics/TestClass.hpp
index 58a6d2a176cb8fa303090689d06cb4fba227fccc..f2951ba653a1baf5dc442a2f1d5341e7108436bc 100644 (file)
--- a/iotjava/iotrmi/C++/basics/TestClass.hpp
+++ b/iotjava/iotrmi/C++/basics/TestClass.hpp
@@ -40,7 +40,8 @@ class TestClass : public TestClassInterface {
 
                // Callbacks
                void                            registerCallback(CallBackInterfaceWithCallBack* _cb);
 
                // Callbacks
                void                            registerCallback(CallBackInterfaceWithCallBack* _cb);

-               //void                          registerCallback(vector<CallBackInterfaceWithCallBack*> _cb);
+               void                            registerCallbackArray(vector<CallBackInterfaceWithCallBack*> _cb);
+               void                            registerCallbackList(vector<CallBackInterfaceWithCallBack*> _cb);

                int                                     callBack();
 
                // Enum
                int                                     callBack();
 
                // Enum


@@ -94,13 +95,22 @@ void TestClass::registerCallback(CallBackInterfaceWithCallBack* _cb) {
 }
 
 
 }
 
 

-/*void TestClass::registerCallback(vector<CallBackInterfaceWithCallBack*> _cb) {
+void TestClass::registerCallbackArray(vector<CallBackInterfaceWithCallBack*> _cb) {

 
 

-       for (CallBackInterface* cb : _cb) {
+       for (CallBackInterfaceWithCallBack* cb : _cb) {

                cbvec.push_back(cb);
                cbvec.push_back(cb);

-               cout << "Registering callback object!" << endl;
+               cout << "Registering callback object in array!" << endl;

        }
        }

-}*/
+}
+
+
+void TestClass::registerCallbackList(vector<CallBackInterfaceWithCallBack*> _cb) {
+
+       for (CallBackInterfaceWithCallBack* cb : _cb) {
+               cbvec.push_back(cb);
+               cout << "Registering callback object in list!" << endl;
+       }
+}

 
 
 int TestClass::callBack() {
 
 
 int TestClass::callBack() {