diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-09-03 14:42:10 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-03 14:42:10 +0200 |
| commit | c82f0a59f136fbeb8b66eabdc29e0e18b64d6717 (patch) | |
| tree | 585ce7bf387885677d020463e446424598a34093 /cpp/src/Ice/Incoming.cpp | |
| parent | Merge branch 'encoding11' into mx (diff) | |
| parent | changing data member mapping to use Ice.Optional in C# (diff) | |
| download | ice-c82f0a59f136fbeb8b66eabdc29e0e18b64d6717.tar.bz2 ice-c82f0a59f136fbeb8b66eabdc29e0e18b64d6717.tar.xz ice-c82f0a59f136fbeb8b66eabdc29e0e18b64d6717.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/IceGrid/Database.cpp
Diffstat (limited to 'cpp/src/Ice/Incoming.cpp')
| -rw-r--r-- | cpp/src/Ice/Incoming.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index 3bc2e23100c..31c68a5d4f5 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -363,12 +363,10 @@ IceInternal::IncomingBase::__handleException(const std::exception& exc) _os.write(replyUnknownLocalException); ostringstream str; str << *le; -#ifdef __GNUC__ if(IceUtilInternal::printStackTraces) { str << '\n' << ex->ice_stackTrace(); } -#endif _os.write(str.str(), false); } else if(const UserException* ue = dynamic_cast<const UserException*>(&exc)) @@ -376,12 +374,10 @@ IceInternal::IncomingBase::__handleException(const std::exception& exc) _os.write(replyUnknownUserException); ostringstream str; str << *ue; -#ifdef __GNUC__ if(IceUtilInternal::printStackTraces) { str << '\n' << ex->ice_stackTrace(); } -#endif _os.write(str.str(), false); } else |