1 files changed, 24 insertions, 2 deletions
diff --git a/cpp/test/Ice/proxy/TestAMDI.h b/cpp/test/Ice/proxy/TestAMDI.h
index b25a0b1dd29..b3400f4f83d 100644
--- a/cpp/test/Ice/proxy/TestAMDI.h
+++ b/cpp/test/Ice/proxy/TestAMDI.h
@@ -12,19 +12,41 @@
 
 #include <TestAMD.h>
 
-class MyDerivedClassI : public Test::MyDerivedClass
+class MyDerivedClassI : 
+#ifdef ICE_CPP11_MAPPING
+    public Test::MyDerivedClassDisp
+#else
+    public Test::MyDerivedClass
+#endif
 {
 public:
 
     MyDerivedClassI();
     
+#ifdef ICE_CPP11_MAPPING
+    virtual void echo_async(
+        const std::shared_ptr<Ice::ObjectPrx>&,
+        ::std::function<void (const ::std::shared_ptr<Ice::ObjectPrx>&)>,
+        ::std::function<void (const ::std::exception_ptr&)>,
+        const Ice::Current&);
+    
+    virtual void shutdown_async(
+        ::std::function<void ()>,
+        ::std::function<void (const ::std::exception_ptr&)>,
+        const Ice::Current&);
+
+    virtual void getContext_async(
+        ::std::function<void (const Ice::Context&)>,
+        ::std::function<void (const ::std::exception_ptr&)>,
+        const Ice::Current&);
+#else
     virtual void echo_async(const Test::AMD_MyDerivedClass_echoPtr&, const Ice::ObjectPrx&, const Ice::Current&);
     virtual void shutdown_async(const Test::AMD_MyClass_shutdownPtr&,
                                 const Ice::Current&);
     virtual void getContext_async(const Test::AMD_MyClass_getContextPtr& cb,
                                   const Ice::Current&);
+#endif
     virtual bool ice_isA(const std::string&, const Ice::Current&) const;
-
 private:
 
     mutable Ice::Context _ctx;