1 files changed, 32 insertions, 6 deletions
diff --git a/cpp/test/Ice/objects/TestI.h b/cpp/test/Ice/objects/TestI.h
index 1f6f37a4cac..7fd7fff9e65 100644
--- a/cpp/test/Ice/objects/TestI.h
+++ b/cpp/test/Ice/objects/TestI.h
@@ -11,6 +11,7 @@
 #define TEST_I_H
 
 #include <Test.h>
+#include <TestCommon.h>
 
 class BI : public Test::B
 {
@@ -79,6 +80,15 @@ public:
     virtual bool checkValues(const Ice::Current&);
 };
 
+#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,12 +96,18 @@ class II : public Test::I
 class JI : public Test::J
 {
 };
+#endif
 
 class HI : public Test::H
 {
 };
 
-class InitialI : public Test::Initial
+class InitialI :
+#ifdef ICE_CPP11_MAPPING
+    public Test::InitialDisp
+#else
+    public Test::Initial
+#endif
 {
 public:
 
@@ -105,16 +121,26 @@ public:
     virtual Test::EPtr getE(const Ice::Current&);
     virtual Test::FPtr getF(const Ice::Current&);
     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&);
     
@@ -141,7 +167,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
 {