diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-08-21 16:17:16 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-08-21 16:17:16 -0230 |
| commit | 33dc83b94215d845ba75b2cd299aa3b64f06fdfc (patch) | |
| tree | 9b65727c9b89b84ee722b37308de819024bd88d1 /cpp/src/Ice/BasicStream.cpp | |
| parent | removing references to IceInternal.SelectorHandler from proguard configs (diff) | |
| download | ice-33dc83b94215d845ba75b2cd299aa3b64f06fdfc.tar.bz2 ice-33dc83b94215d845ba75b2cd299aa3b64f06fdfc.tar.xz ice-33dc83b94215d845ba75b2cd299aa3b64f06fdfc.zip | |
Bug 2664 - Added Ice.PrintStackTraces and cleaned up ifdefs
Diffstat (limited to 'cpp/src/Ice/BasicStream.cpp')
| -rw-r--r-- | cpp/src/Ice/BasicStream.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index 779cc2db7f4..88a48b94236 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -2089,18 +2089,10 @@ IceInternal::BasicStream::readPendingObjects() { (*p)->ice_postUnmarshal(); } - catch(const Ice::Exception& ex) - { - Ice::Warning out(_instance->initializationData().logger); - out << "Ice::Exception raised by ice_postUnmarshal:\n" << ex; -#ifdef __GNUC__ - out << "\n" << ex.ice_stackTrace(); -#endif - } catch(const std::exception& ex) { Ice::Warning out(_instance->initializationData().logger); - out << "std::exception raised by ice_postUnmarshal:\n" << ex.what(); + out << "std::exception raised by ice_postUnmarshal:\n" << ex; } catch(...) { @@ -2148,18 +2140,10 @@ IceInternal::BasicStream::writeInstance(const ObjectPtr& v, Int index) { v->ice_preMarshal(); } - catch(const Ice::Exception& ex) - { - Ice::Warning out(_instance->initializationData().logger); - out << "Ice::Exception raised by ice_preMarshal:\n" << ex; -#ifdef __GNUC__ - out << "\n" << ex.ice_stackTrace(); -#endif - } catch(const std::exception& ex) { Ice::Warning out(_instance->initializationData().logger); - out << "std::exception raised by ice_preMarshal:\n" << ex.what(); + out << "std::exception raised by ice_preMarshal:\n" << ex; } catch(...) { |