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/TestI.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/TestI.cpp')
| -rw-r--r-- | cpp/test/Ice/proxy/TestI.cpp | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/cpp/test/Ice/proxy/TestI.cpp b/cpp/test/Ice/proxy/TestI.cpp index 7ffde953fad..485b84576bd 100644 --- a/cpp/test/Ice/proxy/TestI.cpp +++ b/cpp/test/Ice/proxy/TestI.cpp @@ -17,11 +17,19 @@ MyDerivedClassI::MyDerivedClassI() { } -Ice::ObjectPrxPtr -MyDerivedClassI::echo(const Ice::ObjectPrxPtr& obj, const Ice::Current&) +#ifdef ICE_CPP11_MAPPING +shared_ptr<Ice::ObjectPrx> +MyDerivedClassI::echo(shared_ptr<Ice::ObjectPrx> obj, const Ice::Current&) +{ + return obj; +} +#else +Ice::ObjectPrx +MyDerivedClassI::echo(const Ice::ObjectPrx& obj, const Ice::Current&) { return obj; } +#endif void MyDerivedClassI::shutdown(const Ice::Current& c) @@ -35,13 +43,18 @@ MyDerivedClassI::getContext(const Ice::Current&) return _ctx; } +#ifdef ICE_CPP11_MAPPING bool -MyDerivedClassI::ice_isA(const std::string& s, const Ice::Current& current) const +MyDerivedClassI::ice_isA(string s, const Ice::Current& current) const { _ctx = current.ctx; -#ifdef ICE_CPP11_MAPPING - return Test::MyDerivedClassDisp::ice_isA(s, current); + return Test::MyDerivedClassDisp::ice_isA(move(s), current); +} #else +bool +MyDerivedClassI::ice_isA(const std::string& s, const Ice::Current& current) const +{ + _ctx = current.ctx; return Test::MyDerivedClass::ice_isA(s, current); -#endif } +#endif
\ No newline at end of file |