diff options
| author | Jose <jose@zeroc.com> | 2016-05-09 23:03:21 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-05-09 23:03:21 +0200 |
| commit | 3e685a12bfd92a4ffd86c808ba0f34df907de5c8 (patch) | |
| tree | 2ef8fb8e028d4f14d1516a98f2a18dbadb46a5d7 /cpp/test/Ice/stringConverter/Client.cpp | |
| parent | Update to latest gradle builder (diff) | |
| parent | AIX port (diff) | |
| download | ice-3e685a12bfd92a4ffd86c808ba0f34df907de5c8.tar.bz2 ice-3e685a12bfd92a4ffd86c808ba0f34df907de5c8.tar.xz ice-3e685a12bfd92a4ffd86c808ba0f34df907de5c8.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/test/Ice/stringConverter/Client.cpp')
| -rw-r--r-- | cpp/test/Ice/stringConverter/Client.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/cpp/test/Ice/stringConverter/Client.cpp b/cpp/test/Ice/stringConverter/Client.cpp index 401570a2a89..a4626b615e4 100644 --- a/cpp/test/Ice/stringConverter/Client.cpp +++ b/cpp/test/Ice/stringConverter/Client.cpp @@ -61,6 +61,28 @@ main(int argc, char* argv[]) IceUtil::setProcessStringConverter(new IceUtil::IconvStringConverter<char>("iso815")); } IceUtil::setProcessWstringConverter(new IceUtil::IconvStringConverter<wchar_t>("ucs4")); + +#elif defined(_AIX) + + // Always big-endian + + if(useLocale) + { + IceUtil::setProcessStringConverter(new IceUtil::IconvStringConverter<char>()); + } + else + { + IceUtil::setProcessStringConverter(new IceUtil::IconvStringConverter<char>("ISO8859-15")); + } + + if(sizeof(wchar_t) == 4) + { + IceUtil::setProcessWstringConverter(new IceUtil::IconvStringConverter<wchar_t>("UTF-32")); + } + else + { + IceUtil::setProcessWstringConverter(new IceUtil::IconvStringConverter<wchar_t>("UTF-16")); + } #else if(useLocale) |