diff options
| author | Jose <jose@zeroc.com> | 2019-07-25 17:40:53 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-07-25 17:41:35 +0200 |
| commit | 9ee2198337db8180b81acdc6ec2693bf5477d33d (patch) | |
| tree | f0bfcd620024b4219b720eeb81f0621cf5a4b93c | |
| parent | Fixed IceGrid node to not terminate session with master on interrupt, fixes #464 (diff) | |
| download | ice-9ee2198337db8180b81acdc6ec2693bf5477d33d.tar.bz2 ice-9ee2198337db8180b81acdc6ec2693bf5477d33d.tar.xz ice-9ee2198337db8180b81acdc6ec2693bf5477d33d.zip | |
IceUtil/stacktrace updates for Xcode 10 - Close #460
| -rw-r--r-- | cpp/test/IceUtil/stacktrace/Client.cpp | 8 | ||||
| -rw-r--r-- | cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS (renamed from cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX) | 0 | ||||
| -rw-r--r-- | cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS | 7 | ||||
| -rw-r--r-- | cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS (renamed from cpp/test/IceUtil/stacktrace/StackTrace.release.OSX) | 0 |
4 files changed, 14 insertions, 1 deletions
diff --git a/cpp/test/IceUtil/stacktrace/Client.cpp b/cpp/test/IceUtil/stacktrace/Client.cpp index 44e1eeb15bf..f8468dd5cdd 100644 --- a/cpp/test/IceUtil/stacktrace/Client.cpp +++ b/cpp/test/IceUtil/stacktrace/Client.cpp @@ -211,6 +211,12 @@ int main(int argc, char* argv[]) # elif(_MSC_VER == 1900) filename += "-vc140"; # endif +#elif defined(__apple_build_version__) +# if(__apple_build_version__ >= 10001145) + filename += "-xcode10"; + #else + filename += "-xcode9"; + #endif #endif } else @@ -221,7 +227,7 @@ int main(int argc, char* argv[]) #if defined(_WIN32) filename += ".Win32"; #elif defined(__APPLE__) - filename += ".OSX"; + filename += ".macOS"; #else filename += ".Linux"; #endif diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS index 48c13792257..48c13792257 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX +++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug.macOS diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS new file mode 100644 index 00000000000..e27f4f0296c --- /dev/null +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS @@ -0,0 +1,7 @@ + 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.6.4.dylib + 1 (anonymous namespace)::Thrower::fifth() in client + 2 (anonymous namespace)::Thrower::forth() in client + 3 (anonymous namespace)::Thrower::third() in client + 4 (anonymous namespace)::Thrower::second() in client + 5 main() in client + 6 start() in libdyld.dylib
\ No newline at end of file diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS index 91b65933298..91b65933298 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS |