diff options
| author | Jose <jose@zeroc.com> | 2014-05-02 19:56:38 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-05-02 19:56:38 +0200 |
| commit | 1161c5817059464ab511632c0ce5d14593ced1a3 (patch) | |
| tree | 51bbcdf2a4ea43c430312157350bb4271bc3f40d /cpp/src/IceUtil/StringUtil.cpp | |
| parent | Update .gitignore files (diff) | |
| download | ice-1161c5817059464ab511632c0ce5d14593ced1a3.tar.bz2 ice-1161c5817059464ab511632c0ce5d14593ced1a3.tar.xz ice-1161c5817059464ab511632c0ce5d14593ced1a3.zip | |
ICE-4851 - Use wstrings for input and output data that contain non-ASCII characters?
Diffstat (limited to 'cpp/src/IceUtil/StringUtil.cpp')
| -rw-r--r-- | cpp/src/IceUtil/StringUtil.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp index 55ce5c65d25..16d7c9f18bf 100644 --- a/cpp/src/IceUtil/StringUtil.cpp +++ b/cpp/src/IceUtil/StringUtil.cpp @@ -8,11 +8,11 @@ // ********************************************************************** #include <IceUtil/StringUtil.h> -#include <IceUtil/Unicode.h> +#include <IceUtil/StringConverter.h> #include <cstring> #ifdef ICE_OS_WINRT -#include <IceUtil/ScopedArray.h> +# include <IceUtil/ScopedArray.h> #endif using namespace std; @@ -575,7 +575,7 @@ IceUtilInternal::errorToString(int error, LPCVOID source) LocalFree(msg); } #endif - return IceUtil::wstringToString(result); + return wnativeToNative(getProcessStringConverter(), getProcessWstringConverter(), result); } else { |