diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-05-16 12:30:43 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-05-16 12:30:43 -0400 |
| commit | 3f3450439b7558443a58279980aadaf069f5a086 (patch) | |
| tree | e3d5a066653b410e668b0f71f5cfde42e07177c4 /cpp/src/Ice/Instance.cpp | |
| parent | Fixed build (diff) | |
| download | ice-3f3450439b7558443a58279980aadaf069f5a086.tar.bz2 ice-3f3450439b7558443a58279980aadaf069f5a086.tar.xz ice-3f3450439b7558443a58279980aadaf069f5a086.zip | |
Updated nativeToUTF8 and UTF8ToNative for consistency with stringToWstring/wstringToString
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 20744535880..aa9f8247e3b 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -513,8 +513,8 @@ IceInternal::Instance::stringToIdentity(const string& s) const } } - ident.name = UTF8ToNative(_stringConverter, ident.name); - ident.category = UTF8ToNative(_stringConverter, ident.category); + ident.name = UTF8ToNative(ident.name, _stringConverter); + ident.category = UTF8ToNative(ident.category, _stringConverter); return ident; } @@ -526,8 +526,8 @@ IceInternal::Instance::identityToString(const Identity& ident) const // This method returns the stringified identity. The returned string only // contains printable ascii. It can contain UTF8 in the escaped form. // - string name = nativeToUTF8(_stringConverter, ident.name); - string category = nativeToUTF8(_stringConverter, ident.category); + string name = nativeToUTF8(ident.name, _stringConverter); + string category = nativeToUTF8(ident.category, _stringConverter); if(category.empty()) { |