diff options
| author | Jose <jose@zeroc.com> | 2015-12-09 23:09:20 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-12-09 23:09:20 +0100 |
| commit | a00673a2c1d9634102f91b7c6ebdd453d55a708f (patch) | |
| tree | 2097f43ff5a1516b353ed0e88cc7b4174a518a17 /cpp/test/Ice/proxy/TestAMDI.cpp | |
| parent | Windows build fixes (diff) | |
| download | ice-a00673a2c1d9634102f91b7c6ebdd453d55a708f.tar.bz2 ice-a00673a2c1d9634102f91b7c6ebdd453d55a708f.tar.xz ice-a00673a2c1d9634102f91b7c6ebdd453d55a708f.zip | |
C++11 mapping server side input parameter fixes
Diffstat (limited to 'cpp/test/Ice/proxy/TestAMDI.cpp')
| -rw-r--r-- | cpp/test/Ice/proxy/TestAMDI.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/cpp/test/Ice/proxy/TestAMDI.cpp b/cpp/test/Ice/proxy/TestAMDI.cpp index 54098ebd7ae..e5abfdbf2af 100644 --- a/cpp/test/Ice/proxy/TestAMDI.cpp +++ b/cpp/test/Ice/proxy/TestAMDI.cpp @@ -20,9 +20,9 @@ MyDerivedClassI::MyDerivedClassI() #ifdef ICE_CPP11_MAPPING void MyDerivedClassI::echo_async( - const shared_ptr<Ice::ObjectPrx>& obj, + shared_ptr<Ice::ObjectPrx> obj, function<void (const shared_ptr<Ice::ObjectPrx>&)> response, - function<void (const exception_ptr&)>, + function<void (exception_ptr)>, const Ice::Current&) { response(obj); @@ -31,7 +31,7 @@ MyDerivedClassI::echo_async( void MyDerivedClassI::shutdown_async( function<void ()> response, - function<void (const exception_ptr&)>, + function<void (exception_ptr)>, const Ice::Current& current) { current.adapter->getCommunicator()->shutdown(); @@ -41,11 +41,17 @@ MyDerivedClassI::shutdown_async( void MyDerivedClassI::getContext_async( function<void (const Ice::Context&)> response, - function<void (const exception_ptr&)>, + function<void (exception_ptr)>, const Ice::Current&) { response(_ctx); } +bool +MyDerivedClassI::ice_isA(string s, const Ice::Current& current) const +{ + _ctx = current.ctx; + return Test::MyDerivedClassDisp::ice_isA(move(s), current); +} #else void MyDerivedClassI::echo_async(const Test::AMD_MyDerivedClass_echoPtr& cb, const Ice::ObjectPrx& obj, const Ice::Current&) @@ -65,14 +71,12 @@ MyDerivedClassI::getContext_async(const Test::AMD_MyClass_getContextPtr& cb, con { cb->ice_response(_ctx); } -#endif + bool MyDerivedClassI::ice_isA(const string& s, const Ice::Current& current) const { _ctx = current.ctx; -#ifdef ICE_CPP11_MAPPING - return Test::MyDerivedClassDisp::ice_isA(s, current); -#else return Test::MyDerivedClass::ice_isA(s, current); -#endif } + +#endif |