diff options
Diffstat (limited to 'cpp/test/Ice')
| -rw-r--r-- | cpp/test/Ice/custom/StringConverterI.cpp | 5 | ||||
| -rw-r--r-- | cpp/test/Ice/stringConverter/Server.cpp | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/cpp/test/Ice/custom/StringConverterI.cpp b/cpp/test/Ice/custom/StringConverterI.cpp index dc1e2cfdbba..a879c58b9bb 100644 --- a/cpp/test/Ice/custom/StringConverterI.cpp +++ b/cpp/test/Ice/custom/StringConverterI.cpp @@ -8,7 +8,6 @@ // ********************************************************************** #include <StringConverterI.h> -#include <IceUtil/Unicode.h> using namespace std; using namespace IceUtil; @@ -48,7 +47,7 @@ Byte* Test::WstringConverterI::toUTF8(const wchar_t* sourceStart, const wchar_t* sourceEnd, IceUtil::UTF8Buffer& buffer) const { wstring ws(sourceStart, sourceEnd); - string s = IceUtil::wnativeToNative(0, 0, ws); + string s = IceUtil::wstringToString(ws); size_t size = s.size(); Byte* targetStart = buffer.getMoreBytes(size, 0); @@ -76,6 +75,6 @@ Test::WstringConverterI::fromUTF8(const Byte* sourceStart, const Byte* sourceEnd s[i] = sourceStart[--j]; } - target = IceUtil::nativeToWnative(0, 0, s); + target = IceUtil::stringToWstring(s); } diff --git a/cpp/test/Ice/stringConverter/Server.cpp b/cpp/test/Ice/stringConverter/Server.cpp index 4b9c6a78c20..7b0f9bcc978 100644 --- a/cpp/test/Ice/stringConverter/Server.cpp +++ b/cpp/test/Ice/stringConverter/Server.cpp @@ -31,14 +31,14 @@ public: throw Test::BadEncodingException(); } - return IceUtil::nativeToWnative(IceUtil::getProcessStringConverter(), - IceUtil::getProcessWstringConverter(), msg); + return IceUtil::stringToWstring(msg, IceUtil::getProcessStringConverter(), + IceUtil::getProcessWstringConverter()); } virtual string narrow(const wstring& wmsg, const Ice::Current&) { - return IceUtil::wnativeToNative(IceUtil::getProcessStringConverter(), - IceUtil::getProcessWstringConverter(), wmsg); + return IceUtil::wstringToString(wmsg, IceUtil::getProcessStringConverter(), + IceUtil::getProcessWstringConverter()); } virtual void shutdown(const Ice::Current& current) |