diff options
| author | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
| commit | c5959fd09de61604bedd75354401df6a57395d65 (patch) | |
| tree | 3b0227f631c8b20fb1a1a274b92f63f52f34af2c /cpp/src/IceUtil/UtilException.cpp | |
| parent | Small fix (diff) | |
| parent | Enable -Wconversion with clang - Close #363 (diff) | |
| download | ice-c5959fd09de61604bedd75354401df6a57395d65.tar.bz2 ice-c5959fd09de61604bedd75354401df6a57395d65.tar.xz ice-c5959fd09de61604bedd75354401df6a57395d65.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'cpp/src/IceUtil/UtilException.cpp')
| -rw-r--r-- | cpp/src/IceUtil/UtilException.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceUtil/UtilException.cpp b/cpp/src/IceUtil/UtilException.cpp index 9231cc5fffa..f42b86f89a6 100644 --- a/cpp/src/IceUtil/UtilException.cpp +++ b/cpp/src/IceUtil/UtilException.cpp @@ -350,8 +350,8 @@ getStackFrames() #elif defined(ICE_BACKTRACE) stackFrames.resize(100); - size_t stackDepth = backtrace(&stackFrames.front(), stackFrames.size()); - stackFrames.resize(stackDepth); + int stackDepth = backtrace(&stackFrames.front(), static_cast<int>(stackFrames.size())); + stackFrames.resize(static_cast<size_t>(stackDepth)); if(!stackFrames.empty()) { stackFrames.erase(stackFrames.begin()); // drop the first frame @@ -468,7 +468,7 @@ getStackTrace(const vector<void*>& stackFrames) // Initialize backtraceStrings immediately if(p != stackFrames.end()) { - backtraceStrings = backtrace_symbols(&*p, stackFrames.size()); + backtraceStrings = backtrace_symbols(&*p, static_cast<int>(stackFrames.size())); } # endif |