Merge remote-tracking branch 'origin/encoding11' into mx

Conflicts:
	cpp/config/Make.rules.Darwin
	cpp/src/Ice/ConnectionFactory.cpp
	cpp/src/Ice/ConnectionI.h

1 files changed, 4 insertions, 4 deletions

diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index d6d09d1271a..23fc92af5df 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -28,13 +28,13 @@ using namespace IceInternal;
 IceInternal::LocalExceptionWrapper::LocalExceptionWrapper(const LocalException& ex, bool r) :
     _retry(r)
 {
-    _ex.reset(dynamic_cast<LocalException*>(ex.ice_clone()));
+    _ex.reset(ex.ice_clone());
 }
 
 IceInternal::LocalExceptionWrapper::LocalExceptionWrapper(const LocalExceptionWrapper& ex) :
     _retry(ex._retry)
 {
-    _ex.reset(dynamic_cast<LocalException*>(ex.get()->ice_clone()));
+    _ex.reset(ex.get()->ice_clone());
 }
 
 void
@@ -527,7 +527,7 @@ IceInternal::Outgoing::finished(const LocalException& ex, bool sent)
     _remoteObserver.detach();
 
     _state = StateFailed;
-    _exception.reset(dynamic_cast<LocalException*>(ex.ice_clone()));
+    _exception.reset(ex.ice_clone());
     _sent = sent;
     _monitor.notify();
 }
@@ -601,6 +601,6 @@ void
 IceInternal::BatchOutgoing::finished(const Ice::LocalException& ex, bool)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-    _exception.reset(dynamic_cast<LocalException*>(ex.ice_clone()));
+    _exception.reset(ex.ice_clone());
     _monitor.notify();
 }