diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-06-03 14:11:48 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-06-03 14:11:48 -0400 |
| commit | 48b141f8f6a8603f6b13a85bde002f6b480832f7 (patch) | |
| tree | 41cf4ae281ad96e13216ea208a6579aa442844d3 /cpp/test/Ice/stringConverter/Client.cpp | |
| parent | Fixed 3.7a2 version in msbuild props files (diff) | |
| download | ice-48b141f8f6a8603f6b13a85bde002f6b480832f7.tar.bz2 ice-48b141f8f6a8603f6b13a85bde002f6b480832f7.tar.xz ice-48b141f8f6a8603f6b13a85bde002f6b480832f7.zip | |
Refactored string converters and use codecvt_utf8[_utf16] when
available instead of ConvertUTF
Diffstat (limited to 'cpp/test/Ice/stringConverter/Client.cpp')
| -rw-r--r-- | cpp/test/Ice/stringConverter/Client.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cpp/test/Ice/stringConverter/Client.cpp b/cpp/test/Ice/stringConverter/Client.cpp index a4626b615e4..c9fb040ef01 100644 --- a/cpp/test/Ice/stringConverter/Client.cpp +++ b/cpp/test/Ice/stringConverter/Client.cpp @@ -48,19 +48,19 @@ main(int argc, char* argv[]) // // 28605 == ISO 8859-15 codepage // - IceUtil::setProcessStringConverter(new IceUtil::WindowsStringConverter(28605)); + IceUtil::setProcessStringConverter(IceUtil::createWindowsStringConverter(28605)); useIconv = false; #elif defined(__hpux) if(useLocale) { - IceUtil::setProcessStringConverter(new IceUtil::IconvStringConverter<char>); + IceUtil::setProcessStringConverter(IceUtil::createIconvStringConverter<char>); } else { - IceUtil::setProcessStringConverter(new IceUtil::IconvStringConverter<char>("iso815")); + IceUtil::setProcessStringConverter(IceUtil::createIconvStringConverter<char>("iso815")); } - IceUtil::setProcessWstringConverter(new IceUtil::IconvStringConverter<wchar_t>("ucs4")); + IceUtil::setProcessWstringConverter(IceUtil::createIconvStringConverter<wchar_t>("ucs4")); #elif defined(_AIX) @@ -68,46 +68,46 @@ main(int argc, char* argv[]) if(useLocale) { - IceUtil::setProcessStringConverter(new IceUtil::IconvStringConverter<char>()); + IceUtil::setProcessStringConverter(IceUtil::createIconvStringConverter<char>()); } else { - IceUtil::setProcessStringConverter(new IceUtil::IconvStringConverter<char>("ISO8859-15")); + IceUtil::setProcessStringConverter(IceUtil::createIconvStringConverter<char>("ISO8859-15")); } if(sizeof(wchar_t) == 4) { - IceUtil::setProcessWstringConverter(new IceUtil::IconvStringConverter<wchar_t>("UTF-32")); + IceUtil::setProcessWstringConverter(IceUtil::createIconvStringConverter<wchar_t>("UTF-32")); } else { - IceUtil::setProcessWstringConverter(new IceUtil::IconvStringConverter<wchar_t>("UTF-16")); + IceUtil::setProcessWstringConverter(IceUtil::createIconvStringConverter<wchar_t>("UTF-16")); } #else if(useLocale) { - IceUtil::setProcessStringConverter(new IceUtil::IconvStringConverter<char>()); + IceUtil::setProcessStringConverter(IceUtil::createIconvStringConverter<char>()); } else { - IceUtil::setProcessStringConverter(new IceUtil::IconvStringConverter<char>("ISO8859-15")); + IceUtil::setProcessStringConverter(IceUtil::createIconvStringConverter<char>("ISO8859-15")); } if(sizeof(wchar_t) == 4) { # ifdef ICE_BIG_ENDIAN - IceUtil::setProcessWstringConverter(new IceUtil::IconvStringConverter<wchar_t>("UTF-32BE")); + IceUtil::setProcessWstringConverter(IceUtil::createIconvStringConverter<wchar_t>("UTF-32BE")); # else - IceUtil::setProcessWstringConverter(new IceUtil::IconvStringConverter<wchar_t>("UTF-32LE")); + IceUtil::setProcessWstringConverter(IceUtil::createIconvStringConverter<wchar_t>("UTF-32LE")); # endif } else { # ifdef ICE_BIG_ENDIAN - IceUtil::setProcessWstringConverter(new IceUtil::IconvStringConverter<wchar_t>("UTF-16BE")); + IceUtil::setProcessWstringConverter(IceUtil::createIconvStringConverter<wchar_t>("UTF-16BE")); # else - IceUtil::setProcessWstringConverter(new IceUtil::IconvStringConverter<wchar_t>("UTF-16LE")); + IceUtil::setProcessWstringConverter(IceUtil::createIconvStringConverter<wchar_t>("UTF-16LE")); # endif } #endif |