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, 1 insertions, 30 deletions

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;
 }