C++11 mapping initial commit

1 files changed, 392 insertions, 43 deletions

diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp
index 31a7613abeb..dd316ac08c8 100644
--- a/cpp/test/Ice/inheritance/AllTests.cpp
+++ b/cpp/test/Ice/inheritance/AllTests.cpp
@@ -14,227 +14,576 @@
 using namespace std;
 using namespace Test;
 
-InitialPrx
+InitialPrxPtr
 allTests(const Ice::CommunicatorPtr& communicator)
 {
     cout << "testing stringToProxy... " << flush;
     string ref = "initial:default -p 12010";
-    Ice::ObjectPrx base = communicator->stringToProxy(ref);
+    Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
 
     cout << "testing checked cast... " << flush;
-    InitialPrx initial = InitialPrx::checkedCast(base);
+    InitialPrxPtr initial = ICE_CHECKED_CAST(InitialPrx, base);
     test(initial);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(initial, base));
+#else
     test(initial == base);
+#endif
     cout << "ok" << endl;
 
     cout << "getting proxies for class hierarchy... " << flush;
-    MA::CAPrx ca = initial->caop();
-    MB::CBPrx cb = initial->cbop();
-    MA::CCPrx cc = initial->ccop();
-    MA::CDPrx cd = initial->cdop();
+    MA::CAPrxPtr ca = initial->caop();
+    MB::CBPrxPtr cb = initial->cbop();
+    MA::CCPrxPtr cc = initial->ccop();
+    MA::CDPrxPtr cd = initial->cdop();
+#ifdef ICE_CPP11_MAPPING
+    test(!Ice::targetEquals(ca, cb));
+    test(!Ice::targetEquals(ca, cc));
+    test(!Ice::targetEquals(ca, cd));
+    test(!Ice::targetEquals(cb, cc));
+    test(!Ice::targetEquals(cb, cd));
+    test(!Ice::targetEquals(cc, cd));
+#else
     test(ca != cb);
     test(ca != cc);
     test(ca != cd);
     test(cb != cc);
     test(cb != cd);
     test(cc != cd);
+#endif
     cout << "ok" << endl;
 
     cout << "getting proxies for interface hierarchy... " << flush;
-    MA::IAPrx ia = initial->iaop();
-    MB::IB1Prx ib1 = initial->ib1op();
-    MB::IB2Prx ib2 = initial->ib2op();
-    MA::ICPrx ic = initial->icop();
+    MA::IAPrxPtr ia = initial->iaop();
+    MB::IB1PrxPtr ib1 = initial->ib1op();
+    MB::IB2PrxPtr ib2 = initial->ib2op();
+    MA::ICPrxPtr ic = initial->icop();
+#ifdef ICE_CPP11_MAPPING
+    test(!Ice::targetEquals(ia, ib1));
+    test(!Ice::targetEquals(ia, ib2));
+    test(!Ice::targetEquals(ia, ic));
+    test(!Ice::targetEquals(ib1, ic));
+    test(!Ice::targetEquals(ib2, ic));
+#else
     test(ia != ib1);
     test(ia != ib2);
     test(ia != ic);
     test(ib1 != ic);
     test(ib2 != ic);
+#endif
     cout << "ok" << endl;
 
     cout << "invoking proxy operations on class hierarchy... " << flush;
-    MA::CAPrx cao;
-    MB::CBPrx cbo;
-    MA::CCPrx cco;
+    MA::CAPrxPtr cao;
+    MB::CBPrxPtr cbo;
+    MA::CCPrxPtr cco;
 
     cao = ca->caop(ca);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, ca));
+#else
     test(cao == ca);
+#endif
+
     cao = ca->caop(cb);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cb));
+#else
     test(cao == cb);
+#endif
+
     cao = ca->caop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cc));
+#else
     test(cao == cc);
+#endif
+
     cao = cb->caop(ca);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, ca));
+#else
     test(cao == ca);
+#endif
+    
     cao = cb->caop(cb);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cb));
+#else
     test(cao == cb);
+#endif
+
     cao = cb->caop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cc));
+#else
     test(cao == cc);
+#endif
+
     cao = cc->caop(ca);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, ca));
+#else
     test(cao == ca);
+#endif
+
     cao = cc->caop(cb);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cb));
+#else
     test(cao == cb);
+#endif
+
     cao = cc->caop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cc));
+#else
     test(cao == cc);
+#endif
 
     cao = cb->cbop(cb);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cb));
+#else
     test(cao == cb);
+#endif
+
     cbo = cb->cbop(cb);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cbo, cb));
+#else
     test(cbo == cb);
+#endif
+
     cao = cb->cbop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cc));
+#else
     test(cao == cc);
+#endif
+
     cbo = cb->cbop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cbo, cc));
+#else
     test(cbo == cc);
+#endif
+
     cao = cc->cbop(cb);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cb));
+#else
     test(cao == cb);
+#endif
+
     cbo = cc->cbop(cb);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cbo, cb));
+#else
     test(cbo == cb);
+#endif
+
     cao = cc->cbop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cc));
+#else
     test(cao == cc);
+#endif
+    
     cbo = cc->cbop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cbo, cc));
+#else
     test(cbo == cc);
+#endif
 
     cao = cc->ccop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cc));
+#else
     test(cao == cc);
+#endif
+    
     cbo = cc->ccop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cbo, cc));
+#else
     test(cbo == cc);
+#endif
+    
     cco = cc->ccop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cco, cc));
+#else
     test(cco == cc);
+#endif
     cout << "ok" << endl;
 
     cout << "ditto, but for interface hierarchy... " << flush;
-    MA::IAPrx iao;
-    MB::IB1Prx ib1o;
-    MB::IB2Prx ib2o;
-    MA::ICPrx ico;
+    MA::IAPrxPtr iao;
+    MB::IB1PrxPtr ib1o;
+    MB::IB2PrxPtr ib2o;
+    MA::ICPrxPtr ico;
 
     iao = ia->iaop(ia);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ia));
+#else
     test(iao == ia);
+#endif
+
     iao = ia->iaop(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib1));
+#else
     test(iao == ib1);
+#endif
+
     iao = ia->iaop(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib2));
+#else
     test(iao == ib2);
+#endif
+
     iao = ia->iaop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
+
     iao = ib1->iaop(ia);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ia));
+#else
     test(iao == ia);
+#endif
+
     iao = ib1->iaop(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib1));
+#else
     test(iao == ib1);
+#endif
+
     iao = ib1->iaop(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib2));
+#else
     test(iao == ib2);
+#endif
+
     iao = ib1->iaop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
+
     iao = ib2->iaop(ia);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ia));
+#else
     test(iao == ia);
+#endif
+
     iao = ib2->iaop(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib1));
+#else
     test(iao == ib1);
+#endif
+
     iao = ib2->iaop(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib2));
+#else
     test(iao == ib2);
+#endif
+
     iao = ib2->iaop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
+
     iao = ic->iaop(ia);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ia));
+#else
     test(iao == ia);
+#endif
+
     iao = ic->iaop(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib1));
+#else
     test(iao == ib1);
+#endif
+
     iao = ic->iaop(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib2));
+#else
     test(iao == ib2);
+#endif
+
     iao = ic->iaop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
 
     iao = ib1->ib1op(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib1));
+#else
     test(iao == ib1);
+#endif
+
     ib1o = ib1->ib1op(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib1o, ib1));
+#else
     test(ib1o == ib1);
+#endif
+
     iao = ib1->ib1op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
+
     ib1o = ib1->ib1op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib1o, ic));
+#else
     test(ib1o == ic);
+#endif
+
     iao = ic->ib1op(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib1));
+#else
     test(iao == ib1);
+#endif
+
     ib1o = ic->ib1op(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib1o, ib1));
+#else
     test(ib1o == ib1);
+#endif
+
     iao = ic->ib1op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
     ib1o = ic->ib1op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib1o, ic));
+#else
     test(ib1o == ic);
+#endif
 
     iao = ib2->ib2op(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib2));
+#else
     test(iao == ib2);
+#endif
+
     ib2o = ib2->ib2op(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib2o, ib2));
+#else
     test(ib2o == ib2);
+#endif
+
     iao = ib2->ib2op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
+
     ib2o = ib2->ib2op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib2o, ic));
+#else
     test(ib2o == ic);
+#endif
+
     iao = ic->ib2op(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib2));
+#else
     test(iao == ib2);
+#endif
+
     ib2o = ic->ib2op(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib2o, ib2));
+#else
     test(ib2o == ib2);
+#endif
+
     iao = ic->ib2op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
+
     ib2o = ic->ib2op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib2o, ic));
+#else
     test(ib2o == ic);
+#endif
 
     iao = ic->icop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
+
     ib1o = ic->icop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib1o, ic));
+#else
     test(ib1o == ic);
+#endif
+
     ib2o = ic->icop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib2o, ic));
+#else
     test(ib2o == ic);
+#endif
+
     ico = ic->icop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ico, ic));
+#else
     test(ico == ic);
+#endif
 
     cout << "ok" << endl;
 
     cout << "ditto, but for class implementing interfaces... " << flush;
-    MA::CDPrx cdo;
+    MA::CDPrxPtr cdo;
 
     cao = cd->caop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cd));
+#else
     test(cao == cd);
+#endif
+
     cbo = cd->cbop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cbo, cd));
+#else
     test(cbo == cd);
+#endif
+
     cco = cd->ccop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cco, cd));
+#else
     test(cco == cd);
+#endif
 
     iao = cd->iaop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, cd));
+#else
     test(iao == cd);
+#endif
+
     ib1o = cd->ib1op(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib1o, cd));
+#else
     test(ib1o == cd);
+#endif
+
     ib2o = cd->ib2op(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib2o, cd));
+#else
     test(ib2o == cd);
+#endif
 
     cao = cd->cdop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cd));
+#else
     test(cao == cd);
+#endif
+
     cbo = cd->cdop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cbo, cd));
+#else
     test(cbo == cd);
+#endif
+
     cco = cd->cdop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cco, cd));
+#else
     test(cco == cd);
+#endif
 
     iao = cd->cdop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, cd));
+#else
     test(iao == cd);
+#endif
+
     ib1o = cd->cdop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib1o, cd));
+#else
     test(ib1o == cd);
+#endif
+
     ib2o = cd->cdop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib2o, cd));
+#else
     test(ib2o == cd);
+#endif
 
     cout << "ok" << endl;
     
     cout << "testing one shot constructor... " << flush;
     {
-        MC::APtr a = new MC::A(1);
+        MC::APtr a = ICE_MAKE_SHARED(MC::A, 1);
         test(a->aA == 1);
         
-        MC::BPtr b = new MC::B(1, 2);
+        MC::BPtr b = ICE_MAKE_SHARED(MC::B, 1, 2);
         test(b->aA == 1);
         test(b->bB == 2);
         
-        MC::CPtr c = new MC::C(1, 2, 3);
+        MC::CPtr c = ICE_MAKE_SHARED(MC::C, 1, 2, 3);
         test(c->aA == 1);
         test(c->bB == 2);
         test(c->cC == 3);
         
-        MC::DPtr d = new MC::D(1, 2, 3, 4);
+        MC::DPtr d = ICE_MAKE_SHARED(MC::D, 1, 2, 3, 4);
         test(d->aA == 1);
         test(d->bB == 2);
         test(d->cC == 3);
@@ -242,19 +591,19 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
     
     {
-        MD::APtr a = new MD::A(1);
+        MD::APtr a = ICE_MAKE_SHARED(MD::A, 1);
         test(a->aA == 1);
         
-        MD::BPtr b = new MD::B(1, 2);
+        MD::BPtr b = ICE_MAKE_SHARED(MD::B, 1, 2);
         test(b->aA == 1);
         test(b->bB == 2);
         
-        MD::CPtr c = new MD::C(1, 2, 3);
+        MD::CPtr c = ICE_MAKE_SHARED(MD::C, 1, 2, 3);
         test(c->aA == 1);
         test(c->bB == 2);
         test(c->cC == 3);
         
-        MD::DPtr d = new MD::D(1, 2, 3, 4);
+        MD::DPtr d = ICE_MAKE_SHARED(MD::D, 1, 2, 3, 4);
         test(d->aA == 1);
         test(d->bB == 2);
         test(d->cC == 3);
@@ -262,19 +611,19 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
     
     {
-        ME::APtr a = new ME::A(1);
+        ME::APtr a = ICE_MAKE_SHARED(ME::A, 1);
         test(a->aA == 1);
         
-        ME::BPtr b = new ME::B(1, 2);
+        ME::BPtr b = ICE_MAKE_SHARED(ME::B, 1, 2);
         test(b->aA == 1);
         test(b->bB == 2);
         
-        ME::CPtr c = new ME::C(1, 2, 3);
+        ME::CPtr c = ICE_MAKE_SHARED(ME::C, 1, 2, 3);
         test(c->aA == 1);
         test(c->bB == 2);
         test(c->cC == 3);
 
-        ME::DPtr d = new ME::D(1, 2, 3, 4);
+        ME::DPtr d = ICE_MAKE_SHARED(ME::D, 1, 2, 3, 4);
         test(d->aA == 1);
         test(d->bB == 2);
         test(d->cC == 3);
@@ -282,19 +631,19 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
     
     {
-        MF::APtr a = new MF::A(1);
+        MF::APtr a = ICE_MAKE_SHARED(MF::A, 1);
         test(a->aA == 1);
         
-        MF::BPtr b = new MF::B(1, 2);
+        MF::BPtr b = ICE_MAKE_SHARED(MF::B, 1, 2);
         test(b->aA == 1);
         test(b->bB == 2);
         
-        MF::CPtr c = new MF::C(1, 2, 3);
+        MF::CPtr c = ICE_MAKE_SHARED(MF::C, 1, 2, 3);
         test(c->aA == 1);
         test(c->bB == 2);
         test(c->cC == 3);
 
-        MF::DPtr d = new MF::D(1, 2, 3, 4);
+        MF::DPtr d = ICE_MAKE_SHARED(MF::D, 1, 2, 3, 4);
         test(d->aA == 1);
         test(d->bB == 2);
         test(d->cC == 3);
@@ -302,19 +651,19 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
     
     {
-        MG::APtr a = new MG::A(1);
+        MG::APtr a = ICE_MAKE_SHARED(MG::A, 1);
         test(a->aA == 1);
         
-        MG::BPtr b = new MG::B(1, 2);
+        MG::BPtr b = ICE_MAKE_SHARED(MG::B, 1, 2);
         test(b->aA == 1);
         test(b->bB == 2);
         
-        MG::CPtr c = new MG::C(1, 2, 3);
+        MG::CPtr c = ICE_MAKE_SHARED(MG::C, 1, 2, 3);
         test(c->aA == 1);
         test(c->bB == 2);
         test(c->cC == 3);
 
-        MG::DPtr d = new MG::D(1, 2, 3, 4);
+        MG::DPtr d = ICE_MAKE_SHARED(MG::D, 1, 2, 3, 4);
         test(d->aA == 1);
         test(d->bB == 2);
         test(d->cC == 3);
@@ -322,19 +671,19 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
     
     {
-        MH::APtr a = new MH::A(1);
+        MH::APtr a = ICE_MAKE_SHARED(MH::A, 1);
         test(a->aA == 1);
         
-        MH::BPtr b = new MH::B(1, 2);
+        MH::BPtr b = ICE_MAKE_SHARED(MH::B, 1, 2);
         test(b->aA == 1);
         test(b->bB == 2);
         
-        MH::CPtr c = new MH::C(1, 2, 3);
+        MH::CPtr c = ICE_MAKE_SHARED(MH::C, 1, 2, 3);
         test(c->aA == 1);
         test(c->bB == 2);
         test(c->cC == 3);
 
-        MH::DPtr d = new MH::D(1, 2, 3, 4);
+        MH::DPtr d = ICE_MAKE_SHARED(MH::D, 1, 2, 3, 4);
         test(d->aA == 1);
         test(d->bB == 2);
         test(d->cC == 3);