summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorAustin Henriksen <austin@zeroc.com>2020-12-15 14:10:01 -0500
committerAustin Henriksen <austin@zeroc.com>2020-12-15 15:47:33 -0500
commit1b3eb81f2e5fcd81ec2c6ddf736d51be76229840 (patch)
tree53e33ad7b8fea529b27427e357449ffb9ca121c2 /cpp
parentAdd ability to set python interpreter used to test (diff)
downloadice-1b3eb81f2e5fcd81ec2c6ddf736d51be76229840.tar.bz2
ice-1b3eb81f2e5fcd81ec2c6ddf736d51be76229840.tar.xz
ice-1b3eb81f2e5fcd81ec2c6ddf736d51be76229840.zip
Removed u8 qualifiers from const strings in slice2cpp.
This fixes #1179. It switches tests for this to compile with the utf-8 codepage too.
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/slice2cpp/Gen.cpp2
-rw-r--r--cpp/test/Ice/impl/msbuild/server/server.vcxproj4
-rw-r--r--cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj4
-rw-r--r--cpp/test/Ice/operations/msbuild/client/client.vcxproj4
-rw-r--r--cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj4
-rw-r--r--cpp/test/Ice/operations/msbuild/server/server.vcxproj4
-rw-r--r--cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj4
7 files changed, 25 insertions, 1 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 7790ec60bf2..94ced867a5c 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -108,7 +108,7 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
bool wide = (typeContext & TypeContextUseWstring) || findMetaData(metaData) == "wstring";
if(wide || cpp11)
{
- out << (wide ? "L\"" : "u8\"");
+ out << (wide ? "L\"" : "\"");
out << toStringLiteral(value, "\a\b\f\n\r\t\v", "?", UCN, cpp11 ? 0 : 0x9F + 1);
out << "\"";
}
diff --git a/cpp/test/Ice/impl/msbuild/server/server.vcxproj b/cpp/test/Ice/impl/msbuild/server/server.vcxproj
index 735c9aa6eb8..382c8cc8f9f 100644
--- a/cpp/test/Ice/impl/msbuild/server/server.vcxproj
+++ b/cpp/test/Ice/impl/msbuild/server/server.vcxproj
@@ -135,6 +135,7 @@
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -149,6 +150,7 @@
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -163,6 +165,7 @@
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -177,6 +180,7 @@
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Label="IceBuilder">
diff --git a/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj
index b50810109e4..f8cdf156b57 100644
--- a/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj
+++ b/cpp/test/Ice/impl/msbuild/serveramd/serveramd.vcxproj
@@ -135,6 +135,7 @@
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -149,6 +150,7 @@
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -163,6 +165,7 @@
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -177,6 +180,7 @@
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>STRING_VIEW_IGNORE_STRING_CONVERTER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>%(DisableSpecificWarnings);4100;4503</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Label="IceBuilder">
diff --git a/cpp/test/Ice/operations/msbuild/client/client.vcxproj b/cpp/test/Ice/operations/msbuild/client/client.vcxproj
index 922be6ccf37..e19b8984f6f 100644
--- a/cpp/test/Ice/operations/msbuild/client/client.vcxproj
+++ b/cpp/test/Ice/operations/msbuild/client/client.vcxproj
@@ -125,6 +125,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">
<ClCompile>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -140,11 +141,13 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">
<ClCompile>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">
<ClCompile>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -160,6 +163,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">
<ClCompile>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Label="IceBuilder">
diff --git a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj
index 1d6276567a6..eb899a1edda 100644
--- a/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj
+++ b/cpp/test/Ice/operations/msbuild/collocated/collocated.vcxproj
@@ -131,6 +131,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -143,6 +144,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -155,6 +157,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -167,6 +170,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Label="IceBuilder">
diff --git a/cpp/test/Ice/operations/msbuild/server/server.vcxproj b/cpp/test/Ice/operations/msbuild/server/server.vcxproj
index bbd3b3ee844..ebd62d91fb6 100644
--- a/cpp/test/Ice/operations/msbuild/server/server.vcxproj
+++ b/cpp/test/Ice/operations/msbuild/server/server.vcxproj
@@ -131,6 +131,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -143,6 +144,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -155,6 +157,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -167,6 +170,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Label="IceBuilder">
diff --git a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj
index 6bcd1f21bd7..5d993a75c0f 100644
--- a/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj
+++ b/cpp/test/Ice/operations/msbuild/serveramd/serveramd.vcxproj
@@ -131,6 +131,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -143,6 +144,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -155,6 +157,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -167,6 +170,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Label="IceBuilder">
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 13:09:03 +0000