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/Ice/ThreadPool.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/Ice/ThreadPool.cpp')
| -rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index e0c1680c745..f806e276267 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -28,7 +28,7 @@ #include <Ice/TraceLevels.h> #if defined(ICE_OS_WINRT) -# include <IceUtil/Unicode.h> +# include <IceUtil/StringConverter.h> #endif using namespace std; @@ -959,12 +959,12 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread) catch(Platform::Exception^ ex) { // - // We don't need to pass the wide string converter in the call to wnativeToNative + // We don't need to pass the wide string converter in the call to wstringToString // because the wide string is using the platform default encoding. // Error out(_instance->initializationData().logger); out << "exception in `" << _prefix << "':\n" - << IceUtil::wnativeToNative(_instance->getStringConverter(), 0, ex->Message->Data()) + << IceUtil::wstringToString(ex->Message->Data(), _instance->getStringConverter()) << "\nevent handler: " << current._handler->toString(); } #endif |