diff options
Diffstat (limited to 'cpp/src/IceUtil/Exception.cpp')
-rw-r--r-- | cpp/src/IceUtil/Exception.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp index a2f973fc979..f3e2cc9b750 100644 --- a/cpp/src/IceUtil/Exception.cpp +++ b/cpp/src/IceUtil/Exception.cpp @@ -24,7 +24,8 @@ using namespace std; namespace IceUtilInternal { -bool printStackTraces = false; +bool ICE_DECLSPEC_EXPORT printStackTraces = false; +bool ICE_DECLSPEC_EXPORT nullHandleAbort = false; } @@ -51,19 +52,7 @@ public: Init init; -} - -namespace IceUtil -{ - -bool ICE_DECLSPEC_EXPORT nullHandleAbort = false; - -}; - #ifdef __GNUC__ -namespace -{ - string getStackTrace() { @@ -187,10 +176,10 @@ getStackTrace() return stackTrace; } - -}; #endif +} + IceUtil::Exception::Exception() : _file(0), _line(0) @@ -293,7 +282,7 @@ IceUtil::operator<<(ostream& out, const IceUtil::Exception& ex) IceUtil::NullHandleException::NullHandleException(const char* file, int line) : Exception(file, line) { - if(nullHandleAbort) + if(IceUtilInternal::nullHandleAbort) { abort(); } |