From 981b724fab215232083dac00b1cca0ec0c5d50e2 Mon Sep 17 00:00:00 2001 From: RazvanN7 Date: Mon, 17 Jan 2022 12:27:39 +0200 Subject: [PATCH] Fix Issue 22014 - Wrong MSVC++ mangling of wchar_t --- src/dmd/cppmanglewin.d | 2 +- test/compilable/cppmangle.d | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dmd/cppmanglewin.d b/src/dmd/cppmanglewin.d index fa2a87d72839..41e55cea1114 100644 --- a/src/dmd/cppmanglewin.d +++ b/src/dmd/cppmanglewin.d @@ -262,7 +262,7 @@ public: buf.writeByte('D'); break; case Twchar: - buf.writestring("_S"); // Visual C++ char16_t (since C++11) + buf.writestring("_W"); // Visual C++ char16_t (since C++11) break; case Tdchar: buf.writestring("_U"); // Visual C++ char32_t (since C++11) diff --git a/test/compilable/cppmangle.d b/test/compilable/cppmangle.d index 8c112d1e5485..0aa2150bbfd5 100644 --- a/test/compilable/cppmangle.d +++ b/test/compilable/cppmangle.d @@ -1146,7 +1146,7 @@ version (CppMangle_MSVC) { version (Win64) { - static assert(test_char_mangling.mangleof == "?test_char_mangling@@YAXD_S_U_W@Z"); + static assert(test_char_mangling.mangleof == "?test_char_mangling@@YAXD_W_U_W@Z"); } }