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/LoggerUtil.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/LoggerUtil.cpp')
| -rw-r--r-- | cpp/src/Ice/LoggerUtil.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cpp/src/Ice/LoggerUtil.cpp b/cpp/src/Ice/LoggerUtil.cpp index 3673f5ff650..ebf9ea5de11 100644 --- a/cpp/src/Ice/LoggerUtil.cpp +++ b/cpp/src/Ice/LoggerUtil.cpp @@ -39,7 +39,6 @@ Ice::operator<<(Ice::LoggerOutputBase& out, ios_base& (*val)(ios_base&)) Ice::LoggerOutputBase& Ice::operator<<(Ice::LoggerOutputBase& out, const std::exception& ex) { -#ifdef __GNUC__ if(IceUtilInternal::printStackTraces) { const ::IceUtil::Exception* exception = dynamic_cast<const ::IceUtil::Exception*>(&ex); @@ -49,7 +48,6 @@ Ice::operator<<(Ice::LoggerOutputBase& out, const std::exception& ex) return out; } } -#endif out.__str() << ex.what(); return out; } |