diff options
| author | Jose <jose@zeroc.com> | 2019-07-18 23:51:08 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-07-18 23:51:08 +0200 |
| commit | fc886b010c01cccb8cca3ac4d92f1ebd7fc72295 (patch) | |
| tree | 51cf00a4a955efecc9c94527aeafcb25ffbe57b9 /cpp/test/IceUtil/unicode/Client.cpp | |
| parent | Simplify OutputStream creation (diff) | |
| parent | Fixed non-thread safe AMD dispatch, fixes #448 (#449) (diff) | |
| download | ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.tar.bz2 ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.tar.xz ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'cpp/test/IceUtil/unicode/Client.cpp')
| -rw-r--r-- | cpp/test/IceUtil/unicode/Client.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/test/IceUtil/unicode/Client.cpp b/cpp/test/IceUtil/unicode/Client.cpp index 8e09ef3618e..e40ad062532 100644 --- a/cpp/test/IceUtil/unicode/Client.cpp +++ b/cpp/test/IceUtil/unicode/Client.cpp @@ -187,8 +187,12 @@ main(int argc, char* argv[]) // // Euro sign (U+20AC) is encoded with 1 UTF-16 code unit, and 3 UTF-8 code units // U+10437 is a Deseret character, encoded with 2 UTF-16 code units, and 4 UTF-8 code units - // + // xlC in 32-bit mode truncates U+10437 into a single UTF-16 character +#if defined(__IBMCPP__) && !defined(__64BIT__) + wstring ws = L"\u20ac\u20ac\ud801\udc37"; +#else wstring ws = L"\u20ac\u20ac\U00010437"; +#endif if(sizeof(wchar_t) == 2) { |