http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2140 - Remove code no longer required nowa

that IceUtil::Exception inherits from std::exception

1 files changed, 0 insertions, 41 deletions

diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index 7a7bc182f05..0db1a4acaf6 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -96,24 +96,6 @@ IceInternal::IncomingAsync::__response(bool ok)
 }
 
 void
-IceInternal::IncomingAsync::__exception(const Exception& exc)
-{
-    try
-    {
-        if(!__servantLocatorFinished())
-        {
-            return;
-        }
-
-        __handleException(exc);
-    }
-    catch(const LocalException& ex)
-    {
-        _connection->invokeException(ex, 1);  // Fatal invocation exception
-    }
-}
-
-void
 IceInternal::IncomingAsync::__exception(const std::exception& exc)
 {
     try
@@ -160,11 +142,6 @@ IceInternal::IncomingAsync::__servantLocatorFinished()
         }
         return true;
     }
-    catch(const Exception& ex)
-    {
-        __handleException(ex);
-        return false;
-    }
     catch(const std::exception& ex)
     {
         __handleException(ex);
@@ -311,15 +288,6 @@ IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const vector<Byte>&
 }
 
 void
-IceAsync::Ice::AMD_Object_ice_invoke::ice_exception(const Exception& ex)
-{
-    if(__validateException(ex))
-    {
-        __exception(ex);
-    }
-}
-
-void
 IceAsync::Ice::AMD_Object_ice_invoke::ice_exception(const std::exception& ex)
 {
     if(__validateException(ex))
@@ -361,15 +329,6 @@ IceAsync::Ice::AMD_Array_Object_ice_invoke::ice_response(bool ok, const pair<con
 }
 
 void
-IceAsync::Ice::AMD_Array_Object_ice_invoke::ice_exception(const Exception& ex)
-{
-    if(__validateException(ex))
-    {
-        __exception(ex);
-    }
-}
-
-void
 IceAsync::Ice::AMD_Array_Object_ice_invoke::ice_exception(const std::exception& ex)
 { 
     if(__validateException(ex))