diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-08-16 10:54:23 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-08-16 10:54:23 -0400 |
| commit | 22022f8e61280cc7631c387da87032f98171cf7e (patch) | |
| tree | b5959ebd7964cd2042c551357e8c1274c9abbf65 /cpp/src | |
| parent | ICE-4609 - Add ability to load shared library with full path (diff) | |
| parent | Stack trace generation on Windows now use Unicode functions and generates a U... (diff) | |
| download | ice-22022f8e61280cc7631c387da87032f98171cf7e.tar.bz2 ice-22022f8e61280cc7631c387da87032f98171cf7e.tar.xz ice-22022f8e61280cc7631c387da87032f98171cf7e.zip | |
Merge branch '4818-2' into encoding11
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceUtil/Exception.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp index bda16adeff0..3d4a40a91fc 100644 --- a/cpp/src/IceUtil/Exception.cpp +++ b/cpp/src/IceUtil/Exception.cpp @@ -22,6 +22,8 @@ #endif #if defined(_WIN32) && !defined(__MINGW32__) && !defined(ICE_OS_WINRT) +# include <IceUtil/Unicode.h> +# define DBGHELP_TRANSLATE_TCHAR # include <DbgHelp.h> # include <iomanip> # define ICE_STACK_TRACES @@ -138,12 +140,12 @@ getStackTrace() BOOL ok = SymFromAddr(process, address, 0, symbol); if(ok) { - s << symbol->Name; + s << IceUtil::wstringToString(symbol->Name); ok = SymGetLineFromAddr64(process, address, &displacement, &line); if(ok) { - s << " at line " << line.LineNumber << " in " << line.FileName; + s << " at line " << line.LineNumber << " in " << IceUtil::wstringToString(line.FileName); } } else |