1 files changed, 75 insertions, 16 deletions
diff --git a/cpp/test/Ice/inheritance/TestI.h b/cpp/test/Ice/inheritance/TestI.h
index 3ab1be62372..bdb11e987da 100644
--- a/cpp/test/Ice/inheritance/TestI.h
+++ b/cpp/test/Ice/inheritance/TestI.h
@@ -20,27 +20,85 @@ public:
 
     virtual void shutdown(const Ice::Current&);
 
-    virtual Test::MA::CAPrx caop(const Ice::Current&);
-    virtual Test::MB::CBPrx cbop(const Ice::Current&);
-    virtual Test::MA::CCPrx ccop(const Ice::Current&);
-    virtual Test::MA::CDPrx cdop(const Ice::Current&);
-    virtual Test::MA::IAPrx iaop(const Ice::Current&);
-    virtual Test::MB::IB1Prx ib1op(const Ice::Current&);
-    virtual Test::MB::IB2Prx ib2op(const Ice::Current&);
-    virtual Test::MA::ICPrx icop(const Ice::Current&);
+    virtual Test::MA::CAPrxPtr caop(const Ice::Current&);
+    virtual Test::MB::CBPrxPtr cbop(const Ice::Current&);
+    virtual Test::MA::CCPrxPtr ccop(const Ice::Current&);
+    virtual Test::MA::CDPrxPtr cdop(const Ice::Current&);
+    virtual Test::MA::IAPrxPtr iaop(const Ice::Current&);
+    virtual Test::MB::IB1PrxPtr ib1op(const Ice::Current&);
+    virtual Test::MB::IB2PrxPtr ib2op(const Ice::Current&);
+    virtual Test::MA::ICPrxPtr icop(const Ice::Current&);
 
 private:
 
-    Test::MA::CAPrx _ca;
-    Test::MB::CBPrx _cb;
-    Test::MA::CCPrx _cc;
-    Test::MA::CDPrx _cd;
-    Test::MA::IAPrx _ia;
-    Test::MB::IB1Prx _ib1;
-    Test::MB::IB2Prx _ib2;
-    Test::MA::ICPrx _ic;
+    Test::MA::CAPrxPtr _ca;
+    Test::MB::CBPrxPtr _cb;
+    Test::MA::CCPrxPtr _cc;
+    Test::MA::CDPrxPtr _cd;
+    Test::MA::IAPrxPtr _ia;
+    Test::MB::IB1PrxPtr _ib1;
+    Test::MB::IB2PrxPtr _ib2;
+    Test::MA::ICPrxPtr _ic;
 };
 
+#ifdef ICE_CPP11_MAPPING
+class CAI_ : virtual public Test::MA::CADisp
+{
+public:
+
+    virtual std::shared_ptr<Test::MA::CAPrx> caop(const std::shared_ptr<Test::MA::CAPrx>&, const Ice::Current&);
+};
+
+class CBI : virtual public Test::MB::CBDisp, virtual public CAI_
+{
+public:
+
+    virtual std::shared_ptr<Test::MB::CBPrx> cbop(const std::shared_ptr<Test::MB::CBPrx>&, const Ice::Current&);
+};
+
+class CCI : virtual public Test::MA::CCDisp, virtual public CBI
+{
+public:
+
+    virtual std::shared_ptr<Test::MA::CCPrx> ccop(const std::shared_ptr<Test::MA::CCPrx>&, const Ice::Current&);
+};
+
+class IAI : virtual public Test::MA::IA
+{
+public:
+
+    virtual std::shared_ptr<Test::MA::IAPrx> iaop(const std::shared_ptr<Test::MA::IAPrx>&, const Ice::Current&);
+};
+
+class IB1I : virtual public Test::MB::IB1,
+             virtual public IAI
+{
+public:
+
+    virtual std::shared_ptr<Test::MB::IB1Prx> ib1op(const std::shared_ptr<Test::MB::IB1Prx>&, const Ice::Current&);
+};
+
+class IB2I : virtual public Test::MB::IB2, virtual public IAI
+{
+public:
+
+    virtual std::shared_ptr<Test::MB::IB2Prx> ib2op(const std::shared_ptr<Test::MB::IB2Prx>&, const Ice::Current&);
+};
+
+class ICI : virtual public Test::MA::IC, virtual public IB1I, virtual public IB2I
+{
+public:
+
+    virtual std::shared_ptr<Test::MA::ICPrx> icop(const std::shared_ptr<Test::MA::ICPrx>&, const Ice::Current&);
+};
+
+class CDI : virtual public Test::MA::CDDisp, virtual public CCI, virtual public IB1I, virtual public IB2I
+{
+public:
+
+    virtual std::shared_ptr<Test::MA::CDPrx> cdop(const std::shared_ptr<Test::MA::CDPrx>&, const Ice::Current&);
+};
+#else
 class CAI_ : virtual public Test::MA::CA
 {
 public:
@@ -96,5 +154,6 @@ public:
 
     virtual Test::MA::CDPrx cdop(const Test::MA::CDPrx&, const Ice::Current&);
 };
+#endif
 
 #endif