diff options
| author | Jose <jose@zeroc.com> | 2011-06-06 19:07:05 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2011-06-06 19:07:05 +0200 |
| commit | 1fcb8c7328467e6d7a459e249033f6efb39da7f6 (patch) | |
| tree | dacbe5cde4b095f58680accf2f9e7d5d24639f29 /cpp/src/IceUtil/Exception.cpp | |
| parent | Workaround for GCC 4.4 strict aliasing warning (diff) | |
| download | ice-1fcb8c7328467e6d7a459e249033f6efb39da7f6.tar.bz2 ice-1fcb8c7328467e6d7a459e249033f6efb39da7f6.tar.xz ice-1fcb8c7328467e6d7a459e249033f6efb39da7f6.zip | |
5136 - FreeBSD patches
Diffstat (limited to 'cpp/src/IceUtil/Exception.cpp')
| -rw-r--r-- | cpp/src/IceUtil/Exception.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp index 831244dc800..2b1ff21f56d 100644 --- a/cpp/src/IceUtil/Exception.cpp +++ b/cpp/src/IceUtil/Exception.cpp @@ -14,7 +14,7 @@ #include <ostream> #include <cstdlib> -#if defined(__GNUC__) && !defined(__sun) +#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__) # include <execinfo.h> # include <cxxabi.h> #endif @@ -52,7 +52,7 @@ public: Init init; -#if defined(__GNUC__) && !defined(__sun) +#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__) string getStackTrace() { @@ -183,7 +183,7 @@ getStackTrace() IceUtil::Exception::Exception() : _file(0), _line(0) -#if defined(__GNUC__) && !defined(__sun) +#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__) , _stackTrace(getStackTrace()) #endif { @@ -192,7 +192,7 @@ IceUtil::Exception::Exception() : IceUtil::Exception::Exception(const char* file, int line) : _file(file), _line(line) -#if defined(__GNUC__) && !defined(__sun) +#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__) , _stackTrace(getStackTrace()) #endif { |