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/IceGrid/ServerI.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/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 7adbb72bb6a..283496dce8c 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -405,9 +405,9 @@ struct EnvironmentEval : std::unary_function<string, string> break; } string variable = v.substr(beg + 1, end - beg - 1); - DWORD ret = GetEnvironmentVariableW(IceUtil::nativeToWnative(0, 0, variable).c_str(), &buf[0], + DWORD ret = GetEnvironmentVariableW(IceUtil::stringToWstring(variable).c_str(), &buf[0], static_cast<DWORD>(buf.size())); - string valstr = (ret > 0 && ret < buf.size()) ? IceUtil::wnativeToNative(0, 0, &buf[0]) : string(""); + string valstr = (ret > 0 && ret < buf.size()) ? IceUtil::wstringToString(&buf[0]) : string(""); v.replace(beg, end - beg + 1, valstr); beg += valstr.size(); } |