C++11 mapping initial commit

1 files changed, 38 insertions, 2 deletions

diff --git a/cpp/test/Ice/proxy/TestAMDI.cpp b/cpp/test/Ice/proxy/TestAMDI.cpp
index 401f276292c..54098ebd7ae 100644
--- a/cpp/test/Ice/proxy/TestAMDI.cpp
+++ b/cpp/test/Ice/proxy/TestAMDI.cpp
@@ -11,10 +11,42 @@
 #include <TestAMDI.h>
 #include <TestCommon.h>
 
+using namespace std;
+
 MyDerivedClassI::MyDerivedClassI()
 {
 }
 
+#ifdef ICE_CPP11_MAPPING
+void
+MyDerivedClassI::echo_async(
+    const shared_ptr<Ice::ObjectPrx>& obj,
+    function<void (const shared_ptr<Ice::ObjectPrx>&)> response,
+    function<void (const exception_ptr&)>,
+    const Ice::Current&)
+{
+    response(obj);
+}
+
+void
+MyDerivedClassI::shutdown_async(
+    function<void ()> response,
+    function<void (const exception_ptr&)>,
+    const Ice::Current& current)
+{
+    current.adapter->getCommunicator()->shutdown();
+    response();
+}
+
+void
+MyDerivedClassI::getContext_async(
+    function<void (const Ice::Context&)> response,
+    function<void (const exception_ptr&)>,
+    const Ice::Current&)
+{
+    response(_ctx);
+}
+#else
 void
 MyDerivedClassI::echo_async(const Test::AMD_MyDerivedClass_echoPtr& cb, const Ice::ObjectPrx& obj, const Ice::Current&)
 {
@@ -33,10 +65,14 @@ MyDerivedClassI::getContext_async(const Test::AMD_MyClass_getContextPtr& cb, con
 {
     cb->ice_response(_ctx);
 }
-
+#endif
 bool
-MyDerivedClassI::ice_isA(const std::string& s, const Ice::Current& current) const
+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
 }