1 files changed, 44 insertions, 34 deletions

diff --git a/cpp/test/Ice/objects/TestI.h b/cpp/test/Ice/objects/TestI.h
index 875e18b15e5..a7243ed95f6 100644
--- a/cpp/test/Ice/objects/TestI.h
+++ b/cpp/test/Ice/objects/TestI.h
@@ -11,53 +11,30 @@
 #define TEST_I_H
 
 #include <Test.h>
+#include <TestCommon.h>
 
 class BI : public Test::B
 {
 public:
 
-    BI();
-
-    virtual bool postUnmarshalInvoked(const Ice::Current&);
-
     virtual void ice_preMarshal();
     virtual void ice_postUnmarshal();
-
-private:
-
-    bool _postUnmarshalInvoked;
 };
 
 class CI : public Test::C
 {
 public:
 
-    CI();
-
-    virtual bool postUnmarshalInvoked(const Ice::Current&);
-
     virtual void ice_preMarshal();
     virtual void ice_postUnmarshal();
-
-private:
-
-    bool _postUnmarshalInvoked;
 };
 
 class DI : public Test::D
 {
 public:
 
-    DI();
-
-    virtual bool postUnmarshalInvoked(const Ice::Current&);
-
     virtual void ice_preMarshal();
     virtual void ice_postUnmarshal();
-
-private:
-
-    bool _postUnmarshalInvoked;
 };
 
 class EI : public Test::E
@@ -66,8 +43,9 @@ public:
 
     EI();
 
-    virtual bool checkValues(const Ice::Current&);
+    bool checkValues();
 };
+ICE_DEFINE_PTR(EIPtr, EI);
 
 class FI : public Test::F
 {
@@ -76,9 +54,19 @@ public:
     FI();
     FI(const Test::EPtr&);
 
-    virtual bool checkValues(const Ice::Current&);
+    bool checkValues();
+};
+ICE_DEFINE_PTR(FIPtr, FI);
+
+#ifdef ICE_CPP11_MAPPING
+class II : public ::Ice::InterfaceByValue<Test::I>
+{
 };
 
+class JI : public ::Ice::InterfaceByValue<Test::J>
+{
+};
+#else
 class II : public Test::I
 {
 };
@@ -86,6 +74,7 @@ class II : public Test::I
 class JI : public Test::J
 {
 };
+#endif
 
 class HI : public Test::H
 {
@@ -104,26 +93,47 @@ public:
     virtual Test::DPtr getD(const Ice::Current&);
     virtual Test::EPtr getE(const Ice::Current&);
     virtual Test::FPtr getF(const Ice::Current&);
+
+#ifdef ICE_CPP11_MAPPING
+    virtual GetMBMarshaledResult getMB(const Ice::Current&);
+    virtual void getAMDMBAsync(std::function<void(const GetAMDMBMarshaledResult&)>,
+                               std::function<void(std::exception_ptr)>,
+                               const Ice::Current&);
+#else
+    virtual Test::BPtr getMB(const Ice::Current&);
+    virtual void getAMDMB_async(const Test::AMD_Initial_getAMDMBPtr&, const Ice::Current&);
+#endif
+
     virtual void getAll(Test::BPtr&, Test::BPtr&, Test::CPtr&, Test::DPtr&, const Ice::Current&);
+
+#ifdef ICE_CPP11_MAPPING
+    virtual ::std::shared_ptr<::Ice::Value> getI(const Ice::Current&);
+    virtual ::std::shared_ptr<::Ice::Value> getJ(const Ice::Current&);
+    virtual ::std::shared_ptr<::Ice::Value> getH(const Ice::Current&);
+#else
     virtual Test::IPtr getI(const Ice::Current&);
     virtual Test::IPtr getJ(const Ice::Current&);
     virtual Test::IPtr getH(const Ice::Current&);
-    
-    virtual Test::D1Ptr getD1(const Test::D1Ptr&, const Ice::Current&);
+#endif
+
+    virtual Test::D1Ptr getD1(ICE_IN(Test::D1Ptr), const Ice::Current&);
     virtual void throwEDerived(const Ice::Current&);
 
+#ifdef ICE_CPP11_MAPPING
+    virtual void setI(::std::shared_ptr<::Ice::Value>, const Ice::Current&);
+#else
     virtual void setI(const Test::IPtr&, const Ice::Current&);
-
-    virtual Test::BaseSeq opBaseSeq(const Test::BaseSeq&, Test::BaseSeq&, const Ice::Current&);
+#endif
+    virtual Test::BaseSeq opBaseSeq(ICE_IN(Test::BaseSeq), Test::BaseSeq&, const Ice::Current&);
 
     virtual Test::CompactPtr getCompact(const Ice::Current&);
-    
+
     virtual Test::Inner::APtr getInnerA(const Ice::Current&);
     virtual Test::Inner::Sub::APtr getInnerSubA(const Ice::Current&);
-    
+
     virtual void throwInnerEx(const Ice::Current&);
     virtual void throwInnerSubEx(const Ice::Current&);
-    
+
 private:
 
     Ice::ObjectAdapterPtr _adapter;
@@ -141,7 +151,7 @@ public:
 
     virtual bool ice_invoke(const std::vector<Ice::Byte>&, std::vector<Ice::Byte>&, const Ice::Current&);
 };
-typedef IceUtil::Handle<UnexpectedObjectExceptionTestI> UnexpectedObjectExceptionTestIPtr;
+ICE_DEFINE_PTR(UnexpectedObjectExceptionTestIPtr, UnexpectedObjectExceptionTestI);
 
 class TestIntfI : public Test::TestIntf
 {