summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/proxy/TestI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/Ice/proxy/TestI.cpp')
-rw-r--r--cpp/test/Ice/proxy/TestI.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/cpp/test/Ice/proxy/TestI.cpp b/cpp/test/Ice/proxy/TestI.cpp
index 41bd454e30f..82b26229d1a 100644
--- a/cpp/test/Ice/proxy/TestI.cpp
+++ b/cpp/test/Ice/proxy/TestI.cpp
@@ -17,11 +17,19 @@ MyDerivedClassI::MyDerivedClassI()
{
}
+#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,9 +43,18 @@ MyDerivedClassI::getContext(const Ice::Current&)
return _ctx;
}
+#ifdef ICE_CPP11_MAPPING
+bool
+MyDerivedClassI::ice_isA(string s, const Ice::Current& current) const
+{
+ _ctx = current.ctx;
+ return Test::MyDerivedClass::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