From 5c41870b1df650b874069095fab2d29e93c76d3f Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Fri, 16 May 2014 10:42:54 -0400 Subject: Renamed wnativeToNative/nativeToWnative to wstringToString/stringToWstring --- cpp/demo/IceGrid/icebox/HelloI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpp/demo/IceGrid/icebox/HelloI.cpp') diff --git a/cpp/demo/IceGrid/icebox/HelloI.cpp b/cpp/demo/IceGrid/icebox/HelloI.cpp index 1e96d635ba9..dd30feaaddb 100644 --- a/cpp/demo/IceGrid/icebox/HelloI.cpp +++ b/cpp/demo/IceGrid/icebox/HelloI.cpp @@ -25,7 +25,7 @@ HelloI::sayHello(const Ice::Current&) buf.resize(1024); DWORD val = GetEnvironmentVariableW(L"LANG", &buf[0], static_cast(buf.size())); string lang = (val > 0 && val < buf.size()) ? - IceUtil::wnativeToNative(IceUtil::getProcessStringConverter(), 0, &buf[0]) : string("en"); + IceUtil::wstringToString(&buf[0], IceUtil::getProcessStringConverter()) : string("en"); #else char* val = getenv("LANG"); string lang = val ? string(val) : "en"; -- cgit v1.2.3