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/Reference.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/Reference.cpp')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index be40f3f0df9..a80de29ed09 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -238,7 +238,7 @@ IceInternal::Reference::toString() const // the reference parser uses as separators, then we enclose // the facet string in quotes. // - string fs = nativeToUTF8(_instance->getStringConverter(), _facet); + string fs = nativeToUTF8(_facet, _instance->getStringConverter()); fs = IceUtilInternal::escapeString(fs, ""); if(fs.find_first_of(" :@") != string::npos) { @@ -1207,7 +1207,7 @@ IceInternal::RoutableReference::toString() const // reference parser uses as separators, then we enclose the // adapter id string in quotes. // - string a = nativeToUTF8(getInstance()->getStringConverter(), _adapterId); + string a = nativeToUTF8(_adapterId, getInstance()->getStringConverter()); a = IceUtilInternal::escapeString(a, ""); if(a.find_first_of(" :@") != string::npos) { |