diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-08-01 10:09:48 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-08-01 10:09:48 -0400 |
| commit | 4aa7ae5129a9cb66f5ea26165310e96603af576c (patch) | |
| tree | f8ee6859ad547b59cc28eadb1212f403f51dfff7 /cpp/test/Ice/stringConverter/Client.cpp | |
| parent | Do not initialize OpenSSL locks if already done by other library. (diff) | |
| download | ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.tar.bz2 ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.tar.xz ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.zip | |
Move StringConverter API to namespace Ice
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 6593f7f818f..e0f82d4130b 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(IceUtil::createWindowsStringConverter(28605)); + setProcessStringConverter(Ice::createWindowsStringConverter(28605)); useIconv = false; #elif defined(__hpux) if(useLocale) { - IceUtil::setProcessStringConverter(IceUtil::createIconvStringConverter<char>); + setProcessStringConverter(Ice::createIconvStringConverter<char>); } else { - IceUtil::setProcessStringConverter(IceUtil::createIconvStringConverter<char>("iso815")); + setProcessStringConverter(Ice::createIconvStringConverter<char>("iso815")); } - IceUtil::setProcessWstringConverter(IceUtil::createIconvStringConverter<wchar_t>("ucs4")); + setProcessWstringConverter(Ice::createIconvStringConverter<wchar_t>("ucs4")); #elif defined(_AIX) @@ -68,46 +68,46 @@ main(int argc, char* argv[]) if(useLocale) { - IceUtil::setProcessStringConverter(IceUtil::createIconvStringConverter<char>()); + setProcessStringConverter(Ice::createIconvStringConverter<char>()); } else { - IceUtil::setProcessStringConverter(IceUtil::createIconvStringConverter<char>("ISO8859-15")); + setProcessStringConverter(Ice::createIconvStringConverter<char>("ISO8859-15")); } if(sizeof(wchar_t) == 4) { - IceUtil::setProcessWstringConverter(IceUtil::createIconvStringConverter<wchar_t>("UTF-32")); + setProcessWstringConverter(Ice::createIconvStringConverter<wchar_t>("UTF-32")); } else { - IceUtil::setProcessWstringConverter(IceUtil::createIconvStringConverter<wchar_t>("UTF-16")); + setProcessWstringConverter(Ice::createIconvStringConverter<wchar_t>("UTF-16")); } #else if(useLocale) { - IceUtil::setProcessStringConverter(IceUtil::createIconvStringConverter<char>()); + setProcessStringConverter(Ice::createIconvStringConverter<char>()); } else { - IceUtil::setProcessStringConverter(IceUtil::createIconvStringConverter<char>("ISO8859-15")); + setProcessStringConverter(Ice::createIconvStringConverter<char>("ISO8859-15")); } if(sizeof(wchar_t) == 4) { # ifdef ICE_BIG_ENDIAN - IceUtil::setProcessWstringConverter(IceUtil::createIconvStringConverter<wchar_t>("UTF-32BE")); + setProcessWstringConverter(Ice::createIconvStringConverter<wchar_t>("UTF-32BE")); # else - IceUtil::setProcessWstringConverter(IceUtil::createIconvStringConverter<wchar_t>("UTF-32LE")); + setProcessWstringConverter(Ice::createIconvStringConverter<wchar_t>("UTF-32LE")); # endif } else { # ifdef ICE_BIG_ENDIAN - IceUtil::setProcessWstringConverter(IceUtil::createIconvStringConverter<wchar_t>("UTF-16BE")); + setProcessWstringConverter(Ice::createIconvStringConverter<wchar_t>("UTF-16BE")); # else - IceUtil::setProcessWstringConverter(IceUtil::createIconvStringConverter<wchar_t>("UTF-16LE")); + setProcessWstringConverter(Ice::createIconvStringConverter<wchar_t>("UTF-16LE")); # endif } #endif |