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/IcePatch2Lib/Util.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/IcePatch2Lib/Util.cpp')
| -rw-r--r-- | cpp/src/IcePatch2Lib/Util.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp index 7e49a32d2bf..2fc00be9d7c 100644 --- a/cpp/src/IcePatch2Lib/Util.cpp +++ b/cpp/src/IcePatch2Lib/Util.cpp @@ -422,8 +422,12 @@ IcePatch2::readDirectory(const string& pa) #ifdef _WIN32 + // + // IcePatch2 doesn't support to use string converters, so don't need to use + // any string converter in nativeToWnative or wnativeToNative conversions. + // StringSeq result; - const wstring fs = IceUtil::stringToWstring(simplify(path + "/*")); + const wstring fs = IceUtil::nativeToWnative(0, 0, simplify(path + "/*")); struct _wfinddata_t data; intptr_t h = _wfindfirst(fs.c_str(), &data); @@ -434,7 +438,7 @@ IcePatch2::readDirectory(const string& pa) while(true) { - string name = IceUtil::wstringToString(data.name); + string name = IceUtil::wnativeToNative(0, 0, data.name); assert(!name.empty()); if(name != ".." && name != ".") |