diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-05-16 10:42:54 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-05-16 10:42:54 -0400 |
| commit | 5c41870b1df650b874069095fab2d29e93c76d3f (patch) | |
| tree | acbdeba2738a258f05b26c4f2597d7ba80fa7a2d /cpp/src/IcePatch2Lib/Util.cpp | |
| parent | Fixed ICE-710: error handling test for Unicode functions (diff) | |
| download | ice-5c41870b1df650b874069095fab2d29e93c76d3f.tar.bz2 ice-5c41870b1df650b874069095fab2d29e93c76d3f.tar.xz ice-5c41870b1df650b874069095fab2d29e93c76d3f.zip | |
Renamed wnativeToNative/nativeToWnative to wstringToString/stringToWstring
Diffstat (limited to 'cpp/src/IcePatch2Lib/Util.cpp')
| -rw-r--r-- | cpp/src/IcePatch2Lib/Util.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp index 2fc00be9d7c..d743528d531 100644 --- a/cpp/src/IcePatch2Lib/Util.cpp +++ b/cpp/src/IcePatch2Lib/Util.cpp @@ -424,10 +424,10 @@ IcePatch2::readDirectory(const string& pa) // // IcePatch2 doesn't support to use string converters, so don't need to use - // any string converter in nativeToWnative or wnativeToNative conversions. + // any string converter in stringToWstring or wstringToString conversions. // StringSeq result; - const wstring fs = IceUtil::nativeToWnative(0, 0, simplify(path + "/*")); + const wstring fs = IceUtil::stringToWstring(simplify(path + "/*")); struct _wfinddata_t data; intptr_t h = _wfindfirst(fs.c_str(), &data); @@ -438,7 +438,7 @@ IcePatch2::readDirectory(const string& pa) while(true) { - string name = IceUtil::wnativeToNative(0, 0, data.name); + string name = IceUtil::wstringToString(data.name); assert(!name.empty()); if(name != ".." && name != ".") |