Added ICE_BUILDING_SRC to make builds

Ice::Dispatcher and Ice::LocalObject are now hidden with C++11
Reworked C++11 exception ice_clone, added ExceptionHelper
+ other C++ cleanups

15 files changed, 193 insertions, 254 deletions

diff --git a/cpp/test/Ice/background/Transceiver.cpp b/cpp/test/Ice/background/Transceiver.cpp
index 50920d04b14..18396d6e00f 100644
--- a/cpp/test/Ice/background/Transceiver.cpp
+++ b/cpp/test/Ice/background/Transceiver.cpp
@@ -59,11 +59,7 @@ Transceiver::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buffer& wr
 }
 
 IceInternal::SocketOperation
-#ifdef ICE_CPP11_MAPPING
-Transceiver::closing(bool initiator, exception_ptr ex)
-#else
 Transceiver::closing(bool initiator, const Ice::LocalException& ex)
-#endif
 {
     return _transceiver->closing(initiator, ex);
 }
diff --git a/cpp/test/Ice/background/Transceiver.h b/cpp/test/Ice/background/Transceiver.h
index 7d9f4b80bd7..f84f531126b 100644
--- a/cpp/test/Ice/background/Transceiver.h
+++ b/cpp/test/Ice/background/Transceiver.h
@@ -20,11 +20,7 @@ public:
 
     virtual IceInternal::NativeInfoPtr getNativeInfo();
 
-#ifdef ICE_CPP11_MAPPING
-    virtual IceInternal::SocketOperation closing(bool, std::exception_ptr);
-#else
     virtual IceInternal::SocketOperation closing(bool, const Ice::LocalException&);
-#endif
     virtual void close();
     virtual IceInternal::SocketOperation write(IceInternal::Buffer&);
     virtual IceInternal::SocketOperation read(IceInternal::Buffer&);
diff --git a/cpp/test/Ice/dispatcher/Client.cpp b/cpp/test/Ice/dispatcher/Client.cpp
index b94e3199616..6440ce065f3 100644
--- a/cpp/test/Ice/dispatcher/Client.cpp
+++ b/cpp/test/Ice/dispatcher/Client.cpp
@@ -24,27 +24,6 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     return EXIT_SUCCESS;
 }
 
-#ifdef ICE_CPP11_MAPPING
-class DispatcherCall : public Ice::DispatcherCall
-{
-public:
-
-    DispatcherCall(function<void()> call) :
-        _call(move(call))
-    {
-    }
-
-    virtual void run()
-    {
-        _call();
-    }
-
-private:
-
-    function<void()> _call;
-};
-#endif
-
 int
 main(int argc, char* argv[])
 {
@@ -64,10 +43,10 @@ main(int argc, char* argv[])
         initData.properties->setProperty("Ice.TCP.SndSize", "50000");
 
 #ifdef ICE_CPP11_MAPPING
-        Ice::DispatcherPtr dispatcher = new Dispatcher();
+        IceUtil::Handle<Dispatcher> dispatcher = new Dispatcher;
         initData.dispatcher = [=](function<void()> call, const shared_ptr<Ice::Connection>& conn)
             {
-                dispatcher->dispatch(new DispatcherCall(call), conn);
+                dispatcher->dispatch(make_shared<DispatcherCall>(call), conn);
             };
 #else
         initData.dispatcher = new Dispatcher();
diff --git a/cpp/test/Ice/dispatcher/Collocated.cpp b/cpp/test/Ice/dispatcher/Collocated.cpp
index a83ee20a446..b08e2440643 100644
--- a/cpp/test/Ice/dispatcher/Collocated.cpp
+++ b/cpp/test/Ice/dispatcher/Collocated.cpp
@@ -39,27 +39,6 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     return EXIT_SUCCESS;
 }
 
-#ifdef ICE_CPP11_MAPPING
-class DispatcherCall : public Ice::DispatcherCall
-{
-public:
-
-    DispatcherCall(function<void()> call) :
-        _call(move(call))
-    {
-    }
-
-    virtual void run()
-    {
-        _call();
-    }
-
-private:
-
-    function<void()> _call;
-};
-#endif
-
 int
 main(int argc, char* argv[])
 {
@@ -72,10 +51,10 @@ main(int argc, char* argv[])
         Ice::InitializationData initData;
         initData.properties = Ice::createProperties(argc, argv);
 #ifdef ICE_CPP11_MAPPING
-        Ice::DispatcherPtr dispatcher = new Dispatcher();
+        IceUtil::Handle<Dispatcher> dispatcher = new Dispatcher;
         initData.dispatcher = [=](function<void()> call, const shared_ptr<Ice::Connection>& conn)
             {
-                dispatcher->dispatch(new DispatcherCall(call), conn);
+                dispatcher->dispatch(make_shared<DispatcherCall>(call), conn);
             };
 #else
         initData.dispatcher = new Dispatcher();
diff --git a/cpp/test/Ice/dispatcher/Dispatcher.cpp b/cpp/test/Ice/dispatcher/Dispatcher.cpp
index bbf991b0f65..8fb96f06e1b 100644
--- a/cpp/test/Ice/dispatcher/Dispatcher.cpp
+++ b/cpp/test/Ice/dispatcher/Dispatcher.cpp
@@ -42,9 +42,13 @@ Dispatcher::isDispatcherThread()
     return IceUtil::ThreadControl() == _instance->getThreadControl();
 }
 
+#ifdef ICE_CPP11_MAPPING
+void
+Dispatcher::dispatch(const shared_ptr<DispatcherCall>& call, const shared_ptr<Ice::Connection>&)
+#else
 void
 Dispatcher::dispatch(const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr&)
-
+#endif
 {
     Lock sync(*this);
     _calls.push_back(call);
@@ -59,7 +63,11 @@ Dispatcher::run()
 {
     while(true)
     {
+#ifdef ICE_CPP11_MAPPING
+        shared_ptr<DispatcherCall> call;
+#else
         Ice::DispatcherCallPtr call;
+#endif
         {
             Lock sync(*this);
             
@@ -95,3 +103,4 @@ Dispatcher::run()
         }
     }
 }
+
diff --git a/cpp/test/Ice/dispatcher/Dispatcher.h b/cpp/test/Ice/dispatcher/Dispatcher.h
index 40236236356..b61b64f1dc3 100644
--- a/cpp/test/Ice/dispatcher/Dispatcher.h
+++ b/cpp/test/Ice/dispatcher/Dispatcher.h
@@ -14,17 +14,48 @@
 #include <IceUtil/Monitor.h>
 #include <IceUtil/Mutex.h>
 #include <Ice/Dispatcher.h>
+#include <Ice/Connection.h>
 
 #include <deque>
 
-class Dispatcher : public Ice::Dispatcher, IceUtil::Thread, IceUtil::Monitor<IceUtil::Mutex>
+#ifdef ICE_CPP11_MAPPING
+class DispatcherCall
+{
+public:
+
+    DispatcherCall(std::function<void()> call) :
+        _call(std::move(call))
+    {
+    }
+
+    void run()
+    {
+        _call();
+    }
+
+private:
+
+    std::function<void()> _call;
+};
+#endif
+
+class Dispatcher :
+#ifndef ICE_CPP11_MAPPING
+    public Ice::Dispatcher,
+#endif
+public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
     Dispatcher();
+
+#ifdef ICE_CPP11_MAPPING
+    void dispatch(const std::shared_ptr<DispatcherCall>&, const std::shared_ptr<Ice::Connection>&);
+#else
     virtual void dispatch(const Ice::DispatcherCallPtr&, const Ice::ConnectionPtr&);
+#endif
+
 
-    
     void run();
     static void terminate();
     static bool isDispatcherThread();
@@ -32,7 +63,11 @@ public:
 private:
 
     static Dispatcher* _instance;
+#ifdef ICE_CPP11_MAPPING
+    std::deque<std::shared_ptr<DispatcherCall>> _calls;
+#else
     std::deque<Ice::DispatcherCallPtr> _calls;
+#endif
     bool _terminated;
 };
 
diff --git a/cpp/test/Ice/dispatcher/Server.cpp b/cpp/test/Ice/dispatcher/Server.cpp
index 585bce0c16c..bdc490dd4eb 100644
--- a/cpp/test/Ice/dispatcher/Server.cpp
+++ b/cpp/test/Ice/dispatcher/Server.cpp
@@ -40,27 +40,6 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     return EXIT_SUCCESS;
 }
 
-#ifdef ICE_CPP11_MAPPING
-class DispatcherCall : public Ice::DispatcherCall
-{
-public:
-
-    DispatcherCall(function<void()> call) :
-        _call(move(call))
-    {
-    }
-
-    virtual void run()
-    {
-        _call();
-    }
-
-private:
-
-    function<void()> _call;
-};
-#endif
-
 int
 main(int argc, char* argv[])
 {
@@ -80,10 +59,10 @@ main(int argc, char* argv[])
         initData.properties->setProperty("Ice.TCP.RcvSize", "50000");
 
 #ifdef ICE_CPP11_MAPPING
-        Ice::DispatcherPtr dispatcher = new Dispatcher();
+        IceUtil::Handle<Dispatcher> dispatcher = new Dispatcher;
         initData.dispatcher = [=](function<void()> call, const shared_ptr<Ice::Connection>& conn)
             {
-                dispatcher->dispatch(new DispatcherCall(call), conn);
+                dispatcher->dispatch(make_shared<DispatcherCall>(call), conn);
             };
 #else
         initData.dispatcher = new Dispatcher();
diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
index bcfa1a518fd..9ae2a3a83d3 100644
--- a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
+++ b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
@@ -95,21 +95,12 @@ AMDInterceptorI::getActualStatus() const
     return _actualStatus;
 }
 
-#ifdef ICE_CPP11_MAPPING
-exception_ptr
-AMDInterceptorI::getException() const
-{
-    IceUtil::Mutex::Lock lock(_mutex);
-    return _exception;
-}
-#else
 IceUtil::Exception*
 AMDInterceptorI::getException() const
 {
     IceUtil::Mutex::Lock lock(_mutex);
     return _exception.get();
 }
-#endif
 
 void 
 AMDInterceptorI::clear()
diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.h b/cpp/test/Ice/interceptor/AMDInterceptorI.h
index 50f58356142..935b179b0ba 100644
--- a/cpp/test/Ice/interceptor/AMDInterceptorI.h
+++ b/cpp/test/Ice/interceptor/AMDInterceptorI.h
@@ -24,11 +24,7 @@ public:
     virtual void clear();
 
     Ice::DispatchStatus getActualStatus() const;
-#ifdef ICE_CPP11_MAPPING
-    std::exception_ptr getException() const;
-#else
     IceUtil::Exception* getException() const;
-#endif
 
     void setActualStatus(Ice::DispatchStatus);
     void setActualStatus(const IceUtil::Exception&);
@@ -37,11 +33,7 @@ private:
 
     Ice::DispatchInterceptorAsyncCallbackPtr _defaultCb;
     Ice::DispatchStatus _actualStatus;
-#ifdef ICE_CPP11_MAPPING
-    std::exception_ptr _exception;
-#else
     IceUtil::UniquePtr<IceUtil::Exception> _exception;
-#endif
   
     IceUtil::Mutex _mutex;
 };
diff --git a/cpp/test/Ice/interceptor/Client.cpp b/cpp/test/Ice/interceptor/Client.cpp
index e2bc99e9ec9..c49abdf807e 100644
--- a/cpp/test/Ice/interceptor/Client.cpp
+++ b/cpp/test/Ice/interceptor/Client.cpp
@@ -319,22 +319,8 @@ Client::runAmd(const Test::MyObjectPrxPtr& prx, const AMDInterceptorIPtr& interc
     test(interceptor->getLastStatus() == Ice::DispatchAsync);
     test(interceptor->getActualStatus() == Ice::DispatchAsync);
     
-#ifdef ICE_CPP11_MAPPING
-    try
-    {
-        rethrow_exception(interceptor->getException());
-        test(false);
-    }
-    catch(const Ice::ObjectNotExistException&)
-    {
-    }
-    catch(...)
-    {
-        test(false);
-    }
-#else
     test(dynamic_cast<Ice::ObjectNotExistException*>(interceptor->getException()) != 0);
-#endif
+
     cout << "ok" << endl;
     cout << "testing system exception... " << flush;
     interceptor->clear();
@@ -354,22 +340,7 @@ Client::runAmd(const Test::MyObjectPrxPtr& prx, const AMDInterceptorIPtr& interc
     test(interceptor->getLastOperation() == "amdBadSystemAdd");
     test(interceptor->getLastStatus() == Ice::DispatchAsync);
     test(interceptor->getActualStatus() == Ice::DispatchAsync);
-#ifdef ICE_CPP11_MAPPING
-    try
-    {
-        rethrow_exception(interceptor->getException());
-        test(false);
-    }
-    catch(const MySystemException&)
-    {
-    }
-    catch(...)
-    {
-        test(false);
-    }
-#else
     test(dynamic_cast<MySystemException*>(interceptor->getException()) != 0);
-#endif
     cout << "ok" << endl;
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/interceptor/MyObjectI.cpp b/cpp/test/Ice/interceptor/MyObjectI.cpp
index c59fb3c150d..4e9c7c1f524 100644
--- a/cpp/test/Ice/interceptor/MyObjectI.cpp
+++ b/cpp/test/Ice/interceptor/MyObjectI.cpp
@@ -20,19 +20,19 @@ MySystemException::MySystemException(const char* file, int line) :
 {
 }
 
-#ifndef ICE_CPP11_COMPILER
-MySystemException::~MySystemException() throw()
-{
-}
-#endif
-
 string
 MySystemException::ice_id() const
 {
     return "::MySystemException";
 }
 
-#ifndef ICE_CPP11_MAPPING
+#ifdef ICE_CPP11_MAPPING
+IceUtil::Exception*
+MySystemException::ice_cloneImpl() const
+{
+    return new MySystemException(*this);
+}
+#else
 MySystemException*
 MySystemException::ice_clone() const
 {
diff --git a/cpp/test/Ice/interceptor/MyObjectI.h b/cpp/test/Ice/interceptor/MyObjectI.h
index dadd3cddebf..d75af0fce3b 100644
--- a/cpp/test/Ice/interceptor/MyObjectI.h
+++ b/cpp/test/Ice/interceptor/MyObjectI.h
@@ -18,15 +18,19 @@ public:
 
     MySystemException(const char*, int);
 
-#ifndef ICE_CPP11_COMPILER
-    virtual ~MySystemException() throw();
-#endif
-
     virtual std::string ice_id() const;
+
 #ifndef ICE_CPP11_MAPPING
     virtual MySystemException* ice_clone() const;
 #endif
     virtual void ice_throw() const;
+
+#ifdef ICE_CPP11_MAPPING
+
+protected:
+
+    virtual IceUtil::Exception* ice_cloneImpl() const;
+#endif
 };
 
 class MyObjectI : public Test::MyObject
diff --git a/cpp/test/Ice/operations/OnewaysAMI.cpp b/cpp/test/Ice/operations/OnewaysAMI.cpp
index 4d322b4eef4..aee37aa8ee4 100644
--- a/cpp/test/Ice/operations/OnewaysAMI.cpp
+++ b/cpp/test/Ice/operations/OnewaysAMI.cpp
@@ -16,7 +16,10 @@ using namespace std;
 namespace
 {
 
-class CallbackBase : public Ice::LocalObject
+class CallbackBase 
+#ifndef ICE_CPP11_MAPPING
+: public Ice::LocalObject
+#endif
 {
 public:
 
@@ -55,8 +58,6 @@ private:
     bool _called;
 };
 
-typedef IceUtil::Handle<CallbackBase> CallbackBasePtr;
-
 class Callback : public CallbackBase
 {
 public:
@@ -75,7 +76,7 @@ public:
         test(false);
     }
 };
-typedef IceUtil::Handle<Callback> CallbackPtr;
+ICE_DEFINE_PTR(CallbackPtr, Callback);
 
 }
 
@@ -85,7 +86,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy)
     Test::MyClassPrxPtr p = ICE_UNCHECKED_CAST(Test::MyClassPrx, proxy->ice_oneway());
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->ice_pingAsync(
             nullptr,
@@ -162,7 +163,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy)
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opVoidAsync(
             nullptr,
@@ -183,7 +184,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy)
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opIdempotentAsync(
             nullptr,
@@ -204,7 +205,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy)
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opNonmutatingAsync(
             nullptr,
@@ -244,7 +245,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy)
     }
 #ifdef ICE_CPP11_MAPPING
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         p->ice_pingAsync(nullptr,
                         [=](exception_ptr e)
                         {
diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp
index 462670b423a..1a40355816b 100644
--- a/cpp/test/Ice/operations/TwowaysAMI.cpp
+++ b/cpp/test/Ice/operations/TwowaysAMI.cpp
@@ -32,7 +32,10 @@ using namespace Test;
 namespace
 {
 
-class CallbackBase : public Ice::LocalObject
+class CallbackBase
+#ifndef ICE_CPP11_MAPPING
+: public Ice::LocalObject
+#endif
 {
 public:
 
@@ -71,8 +74,6 @@ private:
     bool _called;
 };
 
-typedef IceUtil::Handle<CallbackBase> CallbackBasePtr;
-
 class Callback : public CallbackBase
 {
 public:
@@ -1033,7 +1034,7 @@ private:
 
     Ice::CommunicatorPtr _communicator;
 };
-typedef IceUtil::Handle<Callback> CallbackPtr;
+ICE_DEFINE_PTR(CallbackPtr, Callback);
 
 }
 
@@ -1059,7 +1060,7 @@ void
 twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& p)
 {
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->ice_pingAsync(
             [&]()
@@ -1077,7 +1078,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->ice_isAAsync(
             Test::MyClass::ice_staticId(),
@@ -1090,13 +1091,13 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         Ice::Callback_Object_ice_isAPtr callback = Ice::newCallback_Object_ice_isA(cb,
                                                                                    &Callback::isA,
                                                                                    &Callback::exCB);
-        p->begin_ice_isA(Test::MyClass::ice_staticId(), callback);        
+        p->begin_ice_isA(Test::MyClass::ice_staticId(), callback);
 #endif
         cb->check();
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->ice_idAsync(
             [&](string id)
@@ -1114,7 +1115,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->ice_idsAsync(
             [&](vector<string> ids)
@@ -1122,7 +1123,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
                 cb->ids(move(ids));
             },
             makeExceptionClosure(cb));
-            
+
 #else
         Ice::Callback_Object_ice_idsPtr callback = Ice::newCallback_Object_ice_ids(cb,
                                                                                    &Callback::ids,
@@ -1133,7 +1134,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opVoidAsync(
             [&]()
@@ -1141,7 +1142,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
                 cb->opVoid();
             },
             makeExceptionClosure(cb));
-            
+
 #else
         Test::Callback_MyClass_opVoidPtr callback = Test::newCallback_MyClass_opVoid(cb,
                                                                                      &Callback::opVoid,
@@ -1152,7 +1153,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opByteAsync(Ice::Byte(0xff), Ice::Byte(0x0f),
             [&](Ice::Byte b1, Ice::Byte b2)
@@ -1170,7 +1171,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opBoolAsync(true, false,
             [&](bool b1, bool b2)
@@ -1188,7 +1189,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opShortIntLongAsync(10, 11, 12,
             [&](long long int l1, short s1, int i1, long long int l2)
@@ -1205,7 +1206,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opFloatDoubleAsync(3.14f, 1.1E10,
             [&](double d1, float f1, double d2)
@@ -1222,7 +1223,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opStringAsync("hello", "world",
             [&](string s1, string s2)
@@ -1240,7 +1241,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opMyEnumAsync(MyEnum::enum2,
             [&](MyEnum e1, MyEnum e2)
@@ -1258,7 +1259,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback(communicator);
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback, communicator);
 #ifdef ICE_CPP11_MAPPING
         p->opMyClassAsync(p,
             [&](shared_ptr<MyClassPrx> c1, shared_ptr<MyClassPrx> c2, shared_ptr<MyClassPrx> c3)
@@ -1285,7 +1286,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         si2.e = ICE_ENUM(Test::MyEnum, enum2);
         si2.s.s = "def";
 
-        CallbackPtr cb = new Callback(communicator);
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback, communicator);
 #ifdef ICE_CPP11_MAPPING
         p->opStructAsync(si1, si2,
             [&](Test::Structure si3, Test::Structure si4)
@@ -1316,7 +1317,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         bsi2.push_back(Ice::Byte(0xf3));
         bsi2.push_back(Ice::Byte(0xf4));
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opByteSAsync(bsi1, bsi2,
             [&](Test::ByteS bsi3, Test::ByteS bsi4)
@@ -1343,7 +1344,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
 
         bsi2.push_back(false);
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opBoolSAsync(bsi1, bsi2,
             [&](Test::BoolS bsi3, Test::BoolS bsi4)
@@ -1378,7 +1379,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         lsi.push_back(30);
         lsi.push_back(20);
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opShortIntLongSAsync(ssi, isi, lsi,
             [&](Test::LongS lsi1, Test::ShortS ssi1, Test::IntS isi1, Test::LongS lsi2)
@@ -1405,7 +1406,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi.push_back(Ice::Double(1.2E10));
         dsi.push_back(Ice::Double(1.3E10));
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opFloatDoubleSAsync(fsi, dsi,
             [&](Test::DoubleS dsi1, Test::FloatS fsi1, Test::DoubleS dsi2)
@@ -1431,7 +1432,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
 
         ssi2.push_back("xyz");
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opStringSAsync(ssi1, ssi2,
             [&](Test::StringS ssi3, Test::StringS ssi4)
@@ -1463,7 +1464,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         bsi2[1].push_back(Ice::Byte(0xf2));
         bsi2[1].push_back(Ice::Byte(0xf1));
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opByteSSAsync(bsi1, bsi2,
             [&](Test::ByteSS bsi3, Test::ByteSS bsi4)
@@ -1495,7 +1496,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         bsi2[0].push_back(false);
         bsi2[0].push_back(true);
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opBoolSSAsync(bsi1, bsi2,
             [&](Test::BoolSS bsi3, Test::BoolSS bsi4)
@@ -1529,7 +1530,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         lsi[0].push_back(496);
         lsi[0].push_back(1729);
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opShortIntLongSSAsync(ssi, isi, lsi,
             [&](Test::LongSS lsi1, Test::ShortSS ssi1, Test::IntSS isi1, Test::LongSS lsi2)
@@ -1559,7 +1560,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi[0].push_back(Ice::Double(1.2E10));
         dsi[0].push_back(Ice::Double(1.3E10));
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opFloatDoubleSSAsync(fsi, dsi,
             [&](Test::DoubleSS dsi1, Test::FloatSS fsi1, Test::DoubleSS dsi2)
@@ -1587,7 +1588,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
 
         ssi2[2].push_back("xyz");
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opStringSSAsync(ssi1, ssi2,
             [&](Test::StringSS ssi3, Test::StringSS ssi4)
@@ -1612,7 +1613,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         di2[11] = false;
         di2[101] = true;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opByteBoolDAsync(di1, di2,
             [&](Test::ByteBoolD di3, Test::ByteBoolD di4)
@@ -1637,7 +1638,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         di2[111] = -100;
         di2[1101] = 0;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opShortIntDAsync(di1, di2,
             [&](Test::ShortIntD di3, Test::ShortIntD di4)
@@ -1662,7 +1663,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         di2[999999120] = Ice::Float(-100.4);
         di2[999999130] = Ice::Float(0.5);
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opLongFloatDAsync(di1, di2,
             [&](Test::LongFloatD di3, Test::LongFloatD di4)
@@ -1687,7 +1688,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         di2["FOO"] = "abc -100.4";
         di2["BAR"] = "abc 0.5";
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opStringStringDAsync(di1, di2,
             [&](Test::StringStringD di3, Test::StringStringD di4)
@@ -1712,7 +1713,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         di2["qwerty"] = ICE_ENUM(Test::MyEnum, enum3);
         di2["Hello!!"] = ICE_ENUM(Test::MyEnum, enum2);
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opStringMyEnumDAsync(di1, di2,
             [&](Test::StringMyEnumD di3, Test::StringMyEnumD di4)
@@ -1742,7 +1743,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         di2[s22] = ICE_ENUM(Test::MyEnum, enum3);
         di2[s23] = ICE_ENUM(Test::MyEnum, enum2);
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opMyStructMyEnumDAsync(di1, di2,
             [&](Test::MyStructMyEnumD di3, Test::MyStructMyEnumD di4)
@@ -1779,7 +1780,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi1[1] = di2;
         dsi2[0] = di3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opByteBoolDSAsync(dsi1, dsi2,
             [&](Test::ByteBoolDS dsi3, Test::ByteBoolDS dsi4)
@@ -1815,7 +1816,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi1[1] = di2;
         dsi2[0] = di3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opShortIntDSAsync(dsi1, dsi2,
             [&](Test::ShortIntDS dsi3, Test::ShortIntDS dsi4)
@@ -1851,7 +1852,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi1[1] = di2;
         dsi2[0] = di3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opLongFloatDSAsync(dsi1, dsi2,
             [&](Test::LongFloatDS dsi3, Test::LongFloatDS dsi4)
@@ -1887,7 +1888,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi1[1] = di2;
         dsi2[0] = di3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opStringStringDSAsync(dsi1, dsi2,
             [&](Test::StringStringDS dsi3, Test::StringStringDS dsi4)
@@ -1895,7 +1896,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
                 cb->opStringStringDS(move(dsi3), move(dsi4));
             },
             makeExceptionClosure(cb));
-            
+
 #else
         Test::Callback_MyClass_opStringStringDSPtr callback =
             Test::newCallback_MyClass_opStringStringDS(cb, &Callback::opStringStringDS, &Callback::exCB);
@@ -1924,7 +1925,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi1[1] = di2;
         dsi2[0] = di3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opStringMyEnumDSAsync(dsi1, dsi2,
             [&](Test::StringMyEnumDS dsi3, Test::StringMyEnumDS dsi4)
@@ -1958,7 +1959,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi1[1] = di2;
         dsi2[0] = di3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opMyEnumStringDSAsync(dsi1, dsi2,
             [&](Test::MyEnumStringDS dsi3, Test::MyEnumStringDS dsi4)
@@ -2000,7 +2001,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi1[1] = di2;
         dsi2[0] = di3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opMyStructMyEnumDSAsync(dsi1, dsi2,
             [&](Test::MyStructMyEnumDS dsi3, MyStructMyEnumDS dsi4)
@@ -2034,7 +2035,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1[Ice::Byte(0x22)] = si2;
         sdi2[Ice::Byte(0xf1)] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opByteByteSDAsync(sdi1, sdi2,
             [&](Test::ByteByteSD sdi3, Test::ByteByteSD sdi4)
@@ -2067,7 +2068,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1[true] = si2;
         sdi2[false] = si1;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opBoolBoolSDAsync(sdi1, sdi2,
             [&](Test::BoolBoolSD sdi3, Test::BoolBoolSD sdi4)
@@ -2103,7 +2104,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1[2] = si2;
         sdi2[4] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opShortShortSDAsync(sdi1, sdi2,
             [&](Test::ShortShortSD sdi3, Test::ShortShortSD sdi4)
@@ -2139,7 +2140,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1[200] = si2;
         sdi2[400] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opIntIntSDAsync(sdi1, sdi2,
             [&](Test::IntIntSD sdi3, Test::IntIntSD sdi4)
@@ -2175,7 +2176,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1[999999991] = si2;
         sdi2[999999992] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opLongLongSDAsync(sdi1, sdi2,
             [&](Test::LongLongSD sdi3, Test::LongLongSD sdi4)
@@ -2211,7 +2212,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1["ABC"] = si2;
         sdi2["aBc"] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opStringFloatSDAsync(sdi1, sdi2,
             [&](Test::StringFloatSD sdi3, Test::StringFloatSD sdi4)
@@ -2247,7 +2248,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1["Goodbye"] = si2;
         sdi2[""] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opStringDoubleSDAsync(sdi1, sdi2,
             [&](Test::StringDoubleSD sdi3, Test::StringDoubleSD sdi4)
@@ -2285,7 +2286,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1["def"] = si2;
         sdi2["ghi"] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opStringStringSDAsync(sdi1, sdi2,
             [&](Test::StringStringSD sdi3, Test::StringStringSD sdi4)
@@ -2321,7 +2322,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1[ICE_ENUM(Test::MyEnum, enum2)] = si2;
         sdi2[ICE_ENUM(Test::MyEnum, enum1)] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opMyEnumMyEnumSDAsync(sdi1, sdi2,
             [&](Test::MyEnumMyEnumSD sdi3, Test::MyEnumMyEnumSD sdi4)
@@ -2347,7 +2348,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
             {
                 s.push_back(i);
             }
-            CallbackPtr cb = new Callback;
+            CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
             p->opIntSAsync(s,
                 [&](Test::IntS s1)
@@ -2597,7 +2598,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     {
         Ice::Double d = 1278312346.0 / 13.0;
         Test::DoubleS ds(5, d);
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opDoubleMarshalingAsync(d, ds,
             [&]()
@@ -2614,7 +2615,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opIdempotentAsync(
             [&]()
@@ -2631,7 +2632,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         p->opNonmutatingAsync(
             [&]()
@@ -2650,7 +2651,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     {
         Test::MyDerivedClassPrxPtr derived = ICE_CHECKED_CAST(Test::MyDerivedClassPrx, p);
         test(derived);
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
 #ifdef ICE_CPP11_MAPPING
         derived->opDerivedAsync(
             [&]()
@@ -2669,7 +2670,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
 #ifdef ICE_CPP11_MAPPING
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->ice_pingAsync();
         try
         {
@@ -2689,7 +2690,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->ice_isAAsync(Test::MyClass::ice_staticId());
         try
         {
@@ -2707,7 +2708,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->ice_idAsync();
         try
         {
@@ -2725,7 +2726,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->ice_idsAsync();
         try
         {
@@ -2743,7 +2744,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opVoidAsync();
         try
         {
@@ -2762,7 +2763,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opByteAsync(Ice::Byte(0xff), Ice::Byte(0x0f));
         try
         {
@@ -2781,7 +2782,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opBoolAsync(true, false);
         try
         {
@@ -2800,7 +2801,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opShortIntLongAsync(10, 11, 12);
         try
         {
@@ -2819,7 +2820,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opFloatDoubleAsync(3.14f, 1.1E10);
         try
         {
@@ -2838,7 +2839,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opStringAsync("hello", "world");
         try
         {
@@ -2857,7 +2858,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opMyEnumAsync(Test::MyEnum::enum2);
         try
         {
@@ -2876,7 +2877,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback(communicator);
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback, communicator);
         auto f = p->opMyClassAsync(p);
         try
         {
@@ -2904,7 +2905,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         si2.e = ICE_ENUM(Test::MyEnum, enum2);
         si2.s.s = "def";
 
-        CallbackPtr cb = new Callback(communicator);
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback, communicator);
         auto f = p->opStructAsync(si1, si2);
         try
         {
@@ -2936,7 +2937,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         bsi2.push_back(Ice::Byte(0xf3));
         bsi2.push_back(Ice::Byte(0xf4));
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opByteSAsync(bsi1, bsi2);
         try
         {
@@ -2964,7 +2965,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
 
         bsi2.push_back(false);
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opBoolSAsync(bsi1, bsi2);
         try
         {
@@ -3000,7 +3001,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         lsi.push_back(30);
         lsi.push_back(20);
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opShortIntLongSAsync(ssi, isi, lsi);
         try
         {
@@ -3029,7 +3030,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi.push_back(Ice::Double(1.2E10));
         dsi.push_back(Ice::Double(1.3E10));
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opFloatDoubleSAsync(fsi, dsi);
         try
         {
@@ -3057,7 +3058,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
 
         ssi2.push_back("xyz");
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opStringSAsync(ssi1, ssi2);
         try
         {
@@ -3090,7 +3091,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         bsi2[1].push_back(Ice::Byte(0xf2));
         bsi2[1].push_back(Ice::Byte(0xf1));
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opByteSSAsync(bsi1, bsi2);
         try
         {
@@ -3121,7 +3122,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi[0].push_back(Ice::Double(1.2E10));
         dsi[0].push_back(Ice::Double(1.3E10));
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opFloatDoubleSSAsync(fsi, dsi);
         try
         {
@@ -3151,7 +3152,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
 
         ssi2[2].push_back("xyz");
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opStringSSAsync(ssi1, ssi2);
         try
         {
@@ -3178,7 +3179,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         di2[11] = false;
         di2[101] = true;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opByteBoolDAsync(di1, di2);
         try
         {
@@ -3205,7 +3206,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         di2[111] = -100;
         di2[1101] = 0;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opShortIntDAsync(di1, di2);
         try
         {
@@ -3232,7 +3233,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         di2[999999120] = Ice::Float(-100.4);
         di2[999999130] = Ice::Float(0.5);
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opLongFloatDAsync(di1, di2);
         try
         {
@@ -3259,7 +3260,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         di2["FOO"] = "abc -100.4";
         di2["BAR"] = "abc 0.5";
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opStringStringDAsync(di1, di2);
         try
         {
@@ -3286,7 +3287,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         di2["qwerty"] = ICE_ENUM(Test::MyEnum, enum3);
         di2["Hello!!"] = ICE_ENUM(Test::MyEnum, enum2);
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opStringMyEnumDAsync(di1, di2);
         try
         {
@@ -3318,7 +3319,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         di2[s22] = ICE_ENUM(Test::MyEnum, enum3);
         di2[s23] = ICE_ENUM(Test::MyEnum, enum2);
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opMyStructMyEnumDAsync(di1, di2);
         try
         {
@@ -3357,7 +3358,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi1[1] = di2;
         dsi2[0] = di3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opByteBoolDSAsync(dsi1, dsi2);
         try
         {
@@ -3395,7 +3396,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi1[1] = di2;
         dsi2[0] = di3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opShortIntDSAsync(dsi1, dsi2);
         try
         {
@@ -3433,7 +3434,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi1[1] = di2;
         dsi2[0] = di3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opLongFloatDSAsync(dsi1, dsi2);
         try
         {
@@ -3471,7 +3472,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi1[1] = di2;
         dsi2[0] = di3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opStringStringDSAsync(dsi1, dsi2);
         try
         {
@@ -3509,7 +3510,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi1[1] = di2;
         dsi2[0] = di3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opStringMyEnumDSAsync(dsi1, dsi2);
         try
         {
@@ -3545,7 +3546,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi1[1] = di2;
         dsi2[0] = di3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opMyEnumStringDSAsync(dsi1, dsi2);
         try
         {
@@ -3589,7 +3590,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         dsi1[1] = di2;
         dsi2[0] = di3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opMyStructMyEnumDSAsync(dsi1, dsi2);
         try
         {
@@ -3625,7 +3626,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1[Ice::Byte(0x22)] = si2;
         sdi2[Ice::Byte(0xf1)] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opByteByteSDAsync(sdi1, sdi2);
         try
         {
@@ -3660,7 +3661,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1[true] = si2;
         sdi2[false] = si1;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opBoolBoolSDAsync(sdi1, sdi2);
         try
         {
@@ -3698,7 +3699,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1[2] = si2;
         sdi2[4] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opShortShortSDAsync(sdi1, sdi2);
         try
         {
@@ -3736,7 +3737,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1[200] = si2;
         sdi2[400] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opIntIntSDAsync(sdi1, sdi2);
         try
         {
@@ -3774,7 +3775,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1[999999991] = si2;
         sdi2[999999992] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opLongLongSDAsync(sdi1, sdi2);
         try
         {
@@ -3812,7 +3813,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1["ABC"] = si2;
         sdi2["aBc"] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opStringFloatSDAsync(sdi1, sdi2);
         try
         {
@@ -3850,7 +3851,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1["Goodbye"] = si2;
         sdi2[""] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opStringDoubleSDAsync(sdi1, sdi2);
         try
         {
@@ -3890,7 +3891,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1["def"] = si2;
         sdi2["ghi"] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opStringStringSDAsync(sdi1, sdi2);
         try
         {
@@ -3929,7 +3930,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
         sdi1[ICE_ENUM(Test::MyEnum, enum2)] = si2;
         sdi2[ICE_ENUM(Test::MyEnum, enum1)] = si3;
 
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opMyEnumMyEnumSDAsync(sdi1, sdi2);
         try
         {
@@ -3957,7 +3958,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
             {
                 s.push_back(i);
             }
-            CallbackPtr cb = new Callback;
+            CallbackPtr cb = ICE_MAKE_SHARED(Callback);
             auto f = p->opIntSAsync(s);
             try
             {
@@ -3978,7 +3979,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     {
         Ice::Double d = 1278312346.0 / 13.0;
         Test::DoubleS ds(5, d);
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opDoubleMarshalingAsync(d, ds);
         try
         {
@@ -3997,7 +3998,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opIdempotentAsync();
         try
         {
@@ -4016,7 +4017,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     }
 
     {
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = p->opNonmutatingAsync();
         try
         {
@@ -4037,7 +4038,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr&
     {
         Test::MyDerivedClassPrxPtr derived = ICE_CHECKED_CAST(Test::MyDerivedClassPrx, p);
         test(derived);
-        CallbackPtr cb = new Callback;
+        CallbackPtr cb = ICE_MAKE_SHARED(Callback);
         auto f = derived->opDerivedAsync();
         try
         {
diff --git a/cpp/test/Ice/retry/SystemFailure.h b/cpp/test/Ice/retry/SystemFailure.h
index ad54020f8a0..01967bb85ec 100644
--- a/cpp/test/Ice/retry/SystemFailure.h
+++ b/cpp/test/Ice/retry/SystemFailure.h
@@ -29,7 +29,12 @@ public:
         return "SystemFailure";
     }
 
-#ifndef ICE_CPP11_MAPPING
+#ifdef ICE_CPP11_MAPPING
+    virtual IceUtil::Exception* ice_cloneImpl() const
+    {
+        return new SystemFailure(*this);
+    }
+#else
     virtual SystemException* ice_clone() const
     {
         return new SystemFailure(*this);
@@ -40,6 +45,7 @@ public:
     {
         throw SystemFailure(*this);
     }
+
 };
 
 #endif