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.cpp8
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
}