summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2021-01-07 23:22:18 +0100
committerJose <jose@zeroc.com>2021-01-07 23:25:00 +0100
commit90e5ee40ed094390db52cd51cdb8af2580b85fde (patch)
tree355e69d0bbe76cd998740dcea2ffb370b81cd8c2 /cpp/test
parentFixed Ice.wrap_future cancellation bug and added asyncio test (#1229) (diff)
downloadice-90e5ee40ed094390db52cd51cdb8af2580b85fde.tar.bz2
ice-90e5ee40ed094390db52cd51cdb8af2580b85fde.tar.xz
ice-90e5ee40ed094390db52cd51cdb8af2580b85fde.zip
Fix for Visual Studio unicode string litereal testing
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/Ice/proxy/AllTests.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp
index 1896c06357a..36a241ec92e 100644
--- a/cpp/test/Ice/proxy/AllTests.cpp
+++ b/cpp/test/Ice/proxy/AllTests.cpp
@@ -366,7 +366,9 @@ allTests(Test::TestHelper* helper)
test(id == id2);
// More unicode characters
-#ifdef ICE_CPP11_MAPPING
+#if defined(ICE_CPP11_MAPPING) && (!defined(_MSC_VER) || (_MSC_VER >= 1911))
+ // To use unicode string literals with Visual Studio we need to build with /utf8
+ // compiler option require Visual Studio 2017 or later
id.name = "banana \016-\U0001F34C\U000020AC\u00a2\u0024";
id.category = "greek \U0001016A";