C++11 mapping initial commit

1 files changed, 10 insertions, 10 deletions

diff --git a/cpp/test/Ice/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp
index f4b3a712d6e..45e9f666ba3 100644
--- a/cpp/test/Ice/operations/AllTests.cpp
+++ b/cpp/test/Ice/operations/AllTests.cpp
@@ -14,45 +14,45 @@
 
 using namespace std;
 
-Test::MyClassPrx
+Test::MyClassPrxPtr
 allTests(const Ice::CommunicatorPtr& communicator)
 {
     string ref = "test:default -p 12010";
-    Ice::ObjectPrx base = communicator->stringToProxy(ref);
-    Test::MyClassPrx cl = Test::MyClassPrx::checkedCast(base);
-    Test::MyDerivedClassPrx derived = Test::MyDerivedClassPrx::checkedCast(cl);
+    Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
+    Test::MyClassPrxPtr cl = ICE_CHECKED_CAST(Test::MyClassPrx, base);
+    Test::MyDerivedClassPrxPtr derived = ICE_CHECKED_CAST(Test::MyDerivedClassPrx, cl);
 
     cout << "testing twoway operations... " << flush;
-    void twoways(const Ice::CommunicatorPtr&, const Test::MyClassPrx&);
+    void twoways(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr&);
     twoways(communicator, cl);
     twoways(communicator, derived);
     derived->opDerived();
     cout << "ok" << endl;
 
     cout << "testing oneway operations... " << flush;
-    void oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrx&);
+    void oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr&);
     oneways(communicator, cl);
     cout << "ok" << endl;
 
     cout << "testing twoway operations with AMI... " << flush;
-    void twowaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx&);
+    void twowaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr&);
     twowaysAMI(communicator, cl);
     twowaysAMI(communicator, derived);
     cout << "ok" << endl;
 
     cout << "testing oneway operations with AMI... " << flush;
-    void onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx&);
+    void onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr&);
     onewaysAMI(communicator, cl);
     cout << "ok" << endl;
 
     cout << "testing batch oneway operations... " << flush;
-    void batchOneways(const Test::MyClassPrx&);
+    void batchOneways(const Test::MyClassPrxPtr&);
     batchOneways(cl);
     batchOneways(derived);
     cout << "ok" << endl;
 
     cout << "testing batch AMI oneway operations... " << flush;
-    void batchOnewaysAMI(const Test::MyClassPrx&);
+    void batchOnewaysAMI(const Test::MyClassPrxPtr&);
     batchOnewaysAMI(cl);
     batchOnewaysAMI(derived);
     cout << "ok" << endl;