diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/Glacier2/router/Client.cpp | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index ea8089755bc..da57ebf4d9b 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2519,7 +2519,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) H << nl << "return begin_" << name << spar << argsAMI << "&__ctx" << "__del" << "__cookie" << epar << ';'; H << eb; - H << sp << nl << retS << " end_" << name << spar << outParamsDeclAMI + H << sp << nl << _dllExport << retS << " end_" << name << spar << outParamsDeclAMI << "const ::Ice::AsyncResultPtr&" << epar << ';'; if(generatePrivateEnd) { diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp index e2c807e1767..e97b0e84392 100644 --- a/cpp/test/Glacier2/router/Client.cpp +++ b/cpp/test/Glacier2/router/Client.cpp @@ -92,8 +92,12 @@ public: communicator->getProperties()->setProperty("Ice.PrintAdapterReady", ""); ObjectAdapterPtr adapter = communicator->createObjectAdapterWithRouter("CallbackReceiverAdapter", router); adapter->activate(); - - string category = router->getCategoryForClient(); + + // + // Verify that the generated end_ method is exported properly - see bug 4719. + // + Ice::AsyncResultPtr r = router->begin_getCategoryForClient(); + string category = router->end_getCategoryForClient(r); { Lock sync(*this); _callbackReceiver = new CallbackReceiverI; |