1 files changed, 9 insertions, 1 deletions
diff --git a/cpp/include/Ice/AsyncResult.h b/cpp/include/Ice/AsyncResult.h
index e682f2d0ee9..12a021e9e7f 100644
--- a/cpp/include/Ice/AsyncResult.h
+++ b/cpp/include/Ice/AsyncResult.h
@@ -147,10 +147,18 @@ private:
     const std::string& _operation;
     const IceInternal::CallbackBasePtr _callback;
     const LocalObjectPtr _cookie;
+#ifdef ICE_CPP11_MAPPING
+    std::exception_ptr _exception;
+#else
     IceUtil::UniquePtr<Exception> _exception;
-
+#endif
+    
     IceInternal::CancellationHandlerPtr _cancellationHandler;
+#ifdef ICE_CPP11_MAPPING
+    std::exception_ptr _cancellationException;
+#else
     IceUtil::UniquePtr<Ice::LocalException> _cancellationException;
+#endif
 
     static const unsigned char OK;
     static const unsigned char Done;