From 6986adaaf6449fb324956f5f3bdd7bb72603fb8e Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Tue, 16 Mar 2021 15:28:56 -0700 Subject: [PATCH] Mirror MSVC-PR-310951 "[modules] Persist standard C++ attributes" --- tests/std/tests/P1502R1_standard_library_header_units/env.lst | 2 +- tests/std/tests/P1502R1_standard_library_header_units/test.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/std/tests/P1502R1_standard_library_header_units/env.lst b/tests/std/tests/P1502R1_standard_library_header_units/env.lst index a5817069927..e0df24e714c 100644 --- a/tests/std/tests/P1502R1_standard_library_header_units/env.lst +++ b/tests/std/tests/P1502R1_standard_library_header_units/env.lst @@ -7,7 +7,7 @@ PM_CL="/w14365 /D_ENFORCE_FACET_SPECIALIZATIONS=1" RUNALL_CROSSLIST PM_CL="/w14640 /Zc:threadSafeInit- /EHsc /std:c++latest" RUNALL_CROSSLIST -PM_CL="/Zc:preprocessor /D_SILENCE_CXX17_STRSTREAM_DEPRECATION_WARNING" +PM_CL="/Zc:preprocessor /D_SILENCE_CXX17_STRSTREAM_DEPRECATION_WARNING /D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING" RUNALL_CROSSLIST PM_CL="/MD" PM_CL="/MDd" diff --git a/tests/std/tests/P1502R1_standard_library_header_units/test.cpp b/tests/std/tests/P1502R1_standard_library_header_units/test.cpp index 2102a025ea9..5794c45566a 100644 --- a/tests/std/tests/P1502R1_standard_library_header_units/test.cpp +++ b/tests/std/tests/P1502R1_standard_library_header_units/test.cpp @@ -206,7 +206,7 @@ int main() { assert(conv.from_bytes(utf8_koshka_cat) == utf16_koshka_cat); assert(conv.to_bytes(utf16_koshka_cat) == utf8_koshka_cat); - static_assert(static_cast(codecvt_mode::consume_header) == 4); // TRANSITION, DevCom-1160041 (deprecated) + static_assert(static_cast(codecvt_mode::consume_header) == 4); } {