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

1 files changed, 5 insertions, 20 deletions

diff --git a/cpp/src/Ice/RequestHandler.cpp b/cpp/src/Ice/RequestHandler.cpp
index bca8cbb84eb..35e67a41864 100644
--- a/cpp/src/Ice/RequestHandler.cpp
+++ b/cpp/src/Ice/RequestHandler.cpp
@@ -13,34 +13,20 @@
 using namespace std;
 using namespace IceInternal;
 
-#ifdef ICE_CPP11_MAPPING
-RetryException::RetryException(std::exception_ptr ex) : _ex(ex)
-{
-}
-
-RetryException::RetryException(const RetryException& ex) : _ex(ex.get())
-{
-}
-
-exception_ptr
-RetryException::get() const
-{
-    assert(_ex);
-    return _ex;
-}
-
-#else
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(RequestHandler* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(CancellationHandler* p) { return p; }
+#endif
+
 
 RetryException::RetryException(const Ice::LocalException& ex)
 {
-    _ex.reset(ex.ice_clone());
+    ICE_RESET_EXCEPTION(_ex, ex.ice_clone());
 }
 
 RetryException::RetryException(const RetryException& ex)
 {
-    _ex.reset(ex.get()->ice_clone());
+    ICE_RESET_EXCEPTION(_ex, ex.get()->ice_clone());
 }
 
 const Ice::LocalException*
@@ -49,7 +35,6 @@ RetryException::get() const
     assert(_ex.get());
     return _ex.get();
 }
-#endif
 
 RequestHandler::RequestHandler(const ReferencePtr& reference) :
     _reference(reference),