1 files changed, 55 insertions, 14 deletions

diff --git a/cpp/test/Slice/keyword/Client.cpp b/cpp/test/Slice/keyword/Client.cpp
index b91cf2abeda..ea833ebce9d 100644
--- a/cpp/test/Slice/keyword/Client.cpp
+++ b/cpp/test/Slice/keyword/Client.cpp
@@ -16,10 +16,21 @@ using namespace std;
 class breakI : public _cpp_and::_cpp_break
 {
 public:
+    
+#ifdef ICE_CPP11_MAPPING
+    virtual void case_async(::Ice::Int,
+                            function<void (int)> response,
+                            function<void (const exception_ptr&)>,
+                            const ::Ice::Current&)
+    {
+        response(0);
+    }
+#else
     virtual void case_async(const ::_cpp_and::AMD_break_casePtr& cb, ::Ice::Int, const ::Ice::Current&)
     {
         cb->ice_response(0);
     }
+#endif
 };
 
 class charI: public _cpp_and::_cpp_char
@@ -47,9 +58,18 @@ public:
 class doI : public _cpp_and::_cpp_do
 {
 public:
+#ifdef ICE_CPP11_MAPPING
+    virtual void case_async(::Ice::Int,
+                            function<void (int)>,
+                            function<void (const exception_ptr&)>,
+                            const ::Ice::Current&)
+    {
+    }
+#else
     virtual void case_async(const ::_cpp_and::AMD_break_casePtr&, ::Ice::Int, const ::Ice::Current&)
     {
     }
+#endif
     virtual void _cpp_explicit(const ::Ice::Current&) 
     {
     }
@@ -62,10 +82,21 @@ class friendI : public _cpp_and::_cpp_friend
 {
 public:
     virtual _cpp_and::_cpp_auto
-    _cpp_goto(_cpp_and::_cpp_continue, const _cpp_and::_cpp_auto&, const _cpp_and::deletePtr&,
-              const _cpp_and::switchPtr&, const _cpp_and::doPtr&, const _cpp_and::breakPrx&,
-              const _cpp_and::charPrx&, const _cpp_and::switchPrx&, const _cpp_and::doPrx&,
-              ::Ice::Int, ::Ice::Int, ::Ice::Int, ::Ice::Int)
+    _cpp_goto(_cpp_and::_cpp_continue, 
+              const _cpp_and::_cpp_auto&,
+#ifdef ICE_CPP11_MAPPING
+              const _cpp_and::_cpp_delete&,
+#else
+              const _cpp_and::deletePtr&,
+#endif
+              const _cpp_and::switchPtr&,
+              const _cpp_and::doPtr&,
+              const _cpp_and::breakPrxPtr&,
+              const _cpp_and::charPrxPtr&,
+              const _cpp_and::switchPrxPtr&,
+              const _cpp_and::doPrxPtr&,
+              ::Ice::Int, ::Ice::Int,
+              ::Ice::Int, ::Ice::Int)
     {
         return _cpp_and::_cpp_auto();
     }
@@ -78,32 +109,42 @@ public:
 void
 testtypes()
 {
+#ifdef ICE_CPP11_MAPPING
+    _cpp_and::_cpp_continue a = _cpp_and::_cpp_continue::_cpp_asm;
+    test(a == _cpp_and::_cpp_continue::_cpp_asm);
+#else
     _cpp_and::_cpp_continue a = _cpp_and::_cpp_asm;
     test(a);
+#endif
 
     _cpp_and::_cpp_auto b, b2;
     b._cpp_default = 0;
     b2._cpp_default = b._cpp_default;
     b._cpp_default = b2._cpp_default;
 
+#ifdef ICE_CPP11_MAPPING
+    _cpp_and::_cpp_delete c;
+    c._cpp_else = "";
+#else
     _cpp_and::deletePtr c = new _cpp_and::_cpp_delete();
     c->_cpp_else = "";
+#endif
 
-    _cpp_and::breakPrx d;
+    _cpp_and::breakPrxPtr d;
     int d2;
     d->_cpp_case(0, d2);
-    _cpp_and::breakPtr d1 = new breakI();
+    _cpp_and::breakPtr d1 = ICE_MAKE_SHARED(breakI);
 
-    _cpp_and::charPrx e;
+    _cpp_and::charPrxPtr e;
     e->_cpp_explicit();
-    _cpp_and::charPtr e1 = new charI();
+    _cpp_and::charPtr e1 = ICE_MAKE_SHARED(charI);
 
-    _cpp_and::switchPtr f1 = new switchI();
+    _cpp_and::switchPtr f1 = ICE_MAKE_SHARED(switchI);
 
-    _cpp_and::doPrx g;
+    _cpp_and::doPrxPtr g;
     g->_cpp_case(0, d2);
     g->_cpp_explicit();
-    _cpp_and::doPtr g1 = new doI();
+    _cpp_and::doPtr g1 = ICE_MAKE_SHARED(doI);
 
     _cpp_and::_cpp_extern h;
     _cpp_and::_cpp_for i;
@@ -114,7 +155,7 @@ testtypes()
     k._cpp_switch = 1;
     k._cpp_signed = 2;
 
-    _cpp_and::friendPtr l = new friendI();
+    _cpp_and::friendPtr l = ICE_MAKE_SHARED(friendI);
 
     const int m  = _cpp_and::_cpp_template;
     test(m == _cpp_and::_cpp_template);
@@ -127,11 +168,11 @@ run(const Ice::CommunicatorPtr& communicator)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    adapter->add(new charI, communicator->stringToIdentity("test"));
+    adapter->add(ICE_MAKE_SHARED(charI), communicator->stringToIdentity("test"));
     adapter->activate();
 
     cout << "Testing operation name... " << flush;
-    _cpp_and::charPrx p = _cpp_and::charPrx::uncheckedCast(
+    _cpp_and::charPrxPtr p = ICE_UNCHECKED_CAST(_cpp_and::charPrx,
         adapter->createProxy(communicator->stringToIdentity("test")));
     p->_cpp_explicit();
     cout << "ok" << endl;