summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/stringConverter/Client.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-05-03 09:03:13 +0200
committerBenoit Foucher <benoit@zeroc.com>2016-05-03 09:03:13 +0200
commitff20dd34f91fecfc351804605b822999cde0e593 (patch)
tree9abce46a1d5403ad64bf350f6d2b5509a91e7eb6 /cpp/test/Ice/stringConverter/Client.cpp
parentFix to no longer recursively try endpoints on connection establishment (diff)
downloadice-ff20dd34f91fecfc351804605b822999cde0e593.tar.bz2
ice-ff20dd34f91fecfc351804605b822999cde0e593.tar.xz
ice-ff20dd34f91fecfc351804605b822999cde0e593.zip
AIX port
Diffstat (limited to 'cpp/test/Ice/stringConverter/Client.cpp')
-rw-r--r--cpp/test/Ice/stringConverter/Client.cpp22
1 files changed, 22 insertions, 0 deletions
diff --git a/cpp/test/Ice/stringConverter/Client.cpp b/cpp/test/Ice/stringConverter/Client.cpp
index 89530b5b45b..c43a6454dd3 100644
--- a/cpp/test/Ice/stringConverter/Client.cpp
+++ b/cpp/test/Ice/stringConverter/Client.cpp
@@ -63,6 +63,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)