diff options
| author | Jose <jose@zeroc.com> | 2015-12-01 17:36:19 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-12-01 17:36:19 +0100 |
| commit | 2029ff368e49fae489b8ec8fc12f7d126b182dfb (patch) | |
| tree | 6075d652b7851831c39e6f22004d8720864f1a60 /cpp/test/Ice/proxy/TestI.cpp | |
| parent | The default LMDB map size for IceGrid and IceStorm is now 10MB (Windows) (diff) | |
| download | ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.tar.bz2 ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.tar.xz ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.zip | |
C++11 mapping initial commit
Diffstat (limited to 'cpp/test/Ice/proxy/TestI.cpp')
| -rw-r--r-- | cpp/test/Ice/proxy/TestI.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/test/Ice/proxy/TestI.cpp b/cpp/test/Ice/proxy/TestI.cpp index e8412bbac8c..7ffde953fad 100644 --- a/cpp/test/Ice/proxy/TestI.cpp +++ b/cpp/test/Ice/proxy/TestI.cpp @@ -17,8 +17,8 @@ MyDerivedClassI::MyDerivedClassI() { } -Ice::ObjectPrx -MyDerivedClassI::echo(const Ice::ObjectPrx& obj, const Ice::Current&) +Ice::ObjectPrxPtr +MyDerivedClassI::echo(const Ice::ObjectPrxPtr& obj, const Ice::Current&) { return obj; } @@ -39,5 +39,9 @@ bool MyDerivedClassI::ice_isA(const std::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 } |