Combining enum, struct, and callback in one method; refactoring method body generatio...

[iot2.git] / iotjava / iotrmi / C++ / basics / TestClassAdvanced_Stub.cpp

diff --git a/iotjava/iotrmi/C++/basics/TestClassAdvanced_Stub.cpp b/iotjava/iotrmi/C++/basics/TestClassAdvanced_Stub.cpp
index 4906167eab242ae94c12a6f949ec87c9944f0308..02aa8bb0f1fd1d201ccb4fb779187f149f1296ad 100644 (file)
--- a/iotjava/iotrmi/C++/basics/TestClassAdvanced_Stub.cpp
+++ b/iotjava/iotrmi/C++/basics/TestClassAdvanced_Stub.cpp
@@ -98,10 +98,10 @@ int main(int argc, char *argv[])
        cb.push_back(cb2);
        cb.push_back(cb3);
        tcStub->registerCallbackArray(cb);
-       cout << "Return value from callback: " << tcStub->callBack() << endl;
+       cout << "Return value from callback: " << tcStub->callBack() << endl;*/
        CallBackInterface *cb4 = new CallBack(53);
        CallBackInterface *cb5 = new CallBack(63);
-       CallBackInterface *cb6 = new CallBack(73);*/
+       CallBackInterface *cb6 = new CallBack(73);
        vector<CallBackInterface*> cblist;
        cblist.push_back(cb4);
        cblist.push_back(cb5);
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
 //     cout << "Return value from callback: " << tcStub->callBack() << endl;
 /*     tcStub->registerCallbackComplex(23, cblist, 0.1234);
        cout << "Return value from callback: " << tcStub->callBack() << endl;*/
-       vector<Enum> vecRes5 = tcStub->handleEnumStruct(vecEn, vecStr, 'c', cblist);
+       vector<Enum> vecRes5 = tcStub->handleAll(vecEn, vecStr, 'c', cblist);
        for (Enum en : vecRes5) {
                cout << "Enum value: " << en << endl;
        }