From 20505ca61813125948cea908f72b59bd783427d3 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Fri, 24 Feb 2023 11:37:04 -0800 Subject: [PATCH] Remove /clr C++20 workarounds. --- stl/inc/algorithm | 14 -------------- stl/inc/format | 5 ----- .../tests/GH_002558_format_presetPadding/env.lst | 4 ++-- tests/std/tests/P0088R3_variant/env.lst | 2 +- .../env.lst | 4 ++-- tests/std/tests/P0912R5_coroutine/env.lst | 4 ++-- tests/std/tests/P1208R6_source_location/test.cpp | 2 -- .../tests/VSO_0157762_feature_test_macros/env.lst | 4 ++-- tests/std/tests/char8_t_17_matrix.lst | 4 ++-- tests/std/tests/char8_t_impure_matrix.lst | 4 ++-- tests/std/tests/char8_t_matrix.lst | 4 ++-- tests/std/tests/clr_matrix.lst | 4 ++-- tests/std/tests/concepts_20_matrix.lst | 4 ++-- tests/std/tests/impure_matrix.lst | 4 ++-- tests/std/tests/locale0_implib_cpp_matrix.lst | 14 +++++++------- tests/std/tests/strict_concepts_20_matrix.lst | 4 ++-- tests/std/tests/usual_17_matrix.lst | 4 ++-- tests/std/tests/usual_20_matrix.lst | 4 ++-- tests/std/tests/usual_matrix.lst | 4 ++-- tests/tr1/env.lst | 4 ++-- tests/tr1/env_minus_md_idl.lst | 4 ++-- tests/tr1/env_minus_pure.lst | 4 ++-- 22 files changed, 42 insertions(+), 63 deletions(-) diff --git a/stl/inc/algorithm b/stl/inc/algorithm index a7a04ca6003..7fc01e3cc4a 100644 --- a/stl/inc/algorithm +++ b/stl/inc/algorithm @@ -932,17 +932,10 @@ namespace ranges { // We've trimmed matching prefixes and matching suffixes. // Now we need to compare each range's prefix to the other range's suffix. -#ifdef _M_CEE // TRANSITION, VSO-1663257 - const auto _ProjectedPred = [&](auto&& _Left, auto&& _Right) -> bool { - return _STD invoke(_Pred, _STD invoke(_Proj1, _STD forward(_Left)), - _STD invoke(_Proj2, _STD forward(_Right))); - }; -#else // ^^^ workaround / no workaround vvv const auto _ProjectedPred = [&](_Ty1&& _Left, _Ty2&& _Right) -> bool { return _STD invoke(_Pred, _STD invoke(_Proj1, _STD forward<_Ty1>(_Left)), _STD invoke(_Proj2, _STD forward<_Ty2>(_Right))); }; -#endif // ^^^ no workaround ^^^ const _TrimResult _Res = _Trim_completely(_First1, _Final1, _First2, _Final2, _ProjectedPred); @@ -1028,17 +1021,10 @@ namespace ranges { // We've trimmed matching prefixes and matching suffixes. // Now we need to compare each range's prefix to the other range's suffix. -#ifdef _M_CEE // TRANSITION, VSO-1663257 - const auto _ProjectedPred = [&](auto&& _Left, auto&& _Right) -> bool { - return _STD invoke(_Pred, _STD invoke(_Proj1, _STD forward(_Left)), - _STD invoke(_Proj2, _STD forward(_Right))); - }; -#else // ^^^ workaround / no workaround vvv const auto _ProjectedPred = [&](_Ty1&& _Left, _Ty2&& _Right) -> bool { return _STD invoke(_Pred, _STD invoke(_Proj1, _STD forward<_Ty1>(_Left)), _STD invoke(_Proj2, _STD forward<_Ty2>(_Right))); }; -#endif // ^^^ no workaround ^^^ const _TrimResult _Res = _Trim_completely(_First1, _Final1, _First2, _Final2, _ProjectedPred); diff --git a/stl/inc/format b/stl/inc/format index 1706947036d..7c78aada0bd 100644 --- a/stl/inc/format +++ b/stl/inc/format @@ -1960,12 +1960,7 @@ public: _NODISCARD size_t _Estimate_required_capacity() const noexcept { using _CharT = typename _Context::char_type; size_t _Result = 0; -#ifdef _M_CEE // TRANSITION, VSO-1663257 - const auto _Visitor = [&_Result](const auto _Arg) noexcept { - using _ArgTy = remove_const_t; -#else // ^^^ workaround / no workaround vvv const auto _Visitor = [&_Result](const _ArgTy _Arg) noexcept { -#endif // ^^^ no workaround ^^^ if constexpr (is_same_v<_ArgTy, basic_string_view<_CharT>>) { _Result += _Arg.size(); } else if constexpr (is_same_v<_ArgTy, const _CharT*>) { diff --git a/tests/std/tests/GH_002558_format_presetPadding/env.lst b/tests/std/tests/GH_002558_format_presetPadding/env.lst index cf58a6b66f7..f02e9c02448 100644 --- a/tests/std/tests/GH_002558_format_presetPadding/env.lst +++ b/tests/std/tests/GH_002558_format_presetPadding/env.lst @@ -19,8 +19,8 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-" -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd" +PM_CL="/clr /MD /std:c++20" +PM_CL="/clr /MDd /std:c++20" # PM_CL="/std:c++20 /permissive- /BE /c /EHsc /MD" # PM_CL="/std:c++latest /permissive- /BE /c /EHsc /MTd" # PM_COMPILER="clang-cl" PM_CL="-fno-ms-compatibility -fno-delayed-template-parsing -Wno-unqualified-std-cast-call /EHsc /std:c++20 /permissive- /MD" diff --git a/tests/std/tests/P0088R3_variant/env.lst b/tests/std/tests/P0088R3_variant/env.lst index 92e8de7e3ed..b2afc414f0e 100644 --- a/tests/std/tests/P0088R3_variant/env.lst +++ b/tests/std/tests/P0088R3_variant/env.lst @@ -26,7 +26,7 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive /DCONSTEXPR_NOTHROW /DTEST_PERMISSIVE" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-" -# With /clr /std:c++20 /d1clrcxxstd, extreme compiler memory consumption causes test timeouts. +# With /clr /std:c++20, extreme compiler memory consumption causes test timeouts. PM_CL="/clr /MD /std:c++17 /DCONSTEXPR_NOTHROW /DTEST_PERMISSIVE" PM_CL="/clr /MDd /std:c++17 /DCONSTEXPR_NOTHROW /DTEST_PERMISSIVE" PM_CL="/BE /c /EHsc /MD /std:c++latest /permissive-" diff --git a/tests/std/tests/P0645R10_text_formatting_legacy_text_encoding/env.lst b/tests/std/tests/P0645R10_text_formatting_legacy_text_encoding/env.lst index fd74dc9139d..fee12cbc26a 100644 --- a/tests/std/tests/P0645R10_text_formatting_legacy_text_encoding/env.lst +++ b/tests/std/tests/P0645R10_text_formatting_legacy_text_encoding/env.lst @@ -22,8 +22,8 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-" # TRANSITION, VSO-1664463 -# PM_CL="/clr /MD /std:c++20 /d1clrcxxstd" -# PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd" +# PM_CL="/clr /MD /std:c++20" +# PM_CL="/clr /MDd /std:c++20" # PM_CL="/std:c++20 /permissive- /BE /c /EHsc /MD" # PM_CL="/std:c++latest /permissive- /BE /c /EHsc /MTd" # PM_COMPILER="clang-cl" PM_CL="-fno-ms-compatibility -fno-delayed-template-parsing -Wno-unqualified-std-cast-call /EHsc /std:c++20 /permissive- /MD" diff --git a/tests/std/tests/P0912R5_coroutine/env.lst b/tests/std/tests/P0912R5_coroutine/env.lst index 29bdc94d056..753a686fb03 100644 --- a/tests/std/tests/P0912R5_coroutine/env.lst +++ b/tests/std/tests/P0912R5_coroutine/env.lst @@ -19,8 +19,8 @@ PM_CL="/EHsc /MD /std:c++latest /permissive" PM_CL="/EHsc /MD /std:c++latest /permissive-" PM_CL="/EHsc /MTd /std:c++latest /permissive- /Zc:preprocessor" PM_CL="/EHsc /MD /std:c++latest /permissive- /analyze:only /analyze:autolog-" -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd" +PM_CL="/clr /MD /std:c++20" +PM_CL="/clr /MDd /std:c++20" PM_CL="/BE /c /EHsc /MD /std:c++20 /permissive-" PM_CL="/BE /c /EHsc /MTd /std:c++latest /permissive-" PM_COMPILER="clang-cl" PM_CL="-fno-ms-compatibility -fno-delayed-template-parsing -Wno-unqualified-std-cast-call /EHsc /MD /std:c++20 /permissive-" diff --git a/tests/std/tests/P1208R6_source_location/test.cpp b/tests/std/tests/P1208R6_source_location/test.cpp index 57eb3210ed5..8711f14e60a 100644 --- a/tests/std/tests/P1208R6_source_location/test.cpp +++ b/tests/std/tests/P1208R6_source_location/test.cpp @@ -135,9 +135,7 @@ constexpr void lambda_test() { const auto x2 = l2(); assert(x1.line() == __LINE__ - 4); assert(x2.line() == __LINE__ - 4); -#ifndef _M_CEE // TRANSITION, VSO-1665663 assert(x1.column() == 52); -#endif // !_M_CEE assert(x2.column() == 50); #if defined(__clang__) || defined(__EDG__) // TRANSITION, DevCom-10199227 and LLVM-58951 assert(x1.function_name() == "lambda_test"sv); diff --git a/tests/std/tests/VSO_0157762_feature_test_macros/env.lst b/tests/std/tests/VSO_0157762_feature_test_macros/env.lst index ecc336491a2..6dabb5c1e84 100644 --- a/tests/std/tests/VSO_0157762_feature_test_macros/env.lst +++ b/tests/std/tests/VSO_0157762_feature_test_macros/env.lst @@ -22,8 +22,8 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-" -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd" +PM_CL="/clr /MD /std:c++20" +PM_CL="/clr /MDd /std:c++20" PM_CL="/clr:pure /MD /std:c++14" PM_CL="/clr:pure /MDd /std:c++14" PM_CL="/BE /c /EHsc /MD /std:c++14" diff --git a/tests/std/tests/char8_t_17_matrix.lst b/tests/std/tests/char8_t_17_matrix.lst index 95b7ee931fd..97170842230 100644 --- a/tests/std/tests/char8_t_17_matrix.lst +++ b/tests/std/tests/char8_t_17_matrix.lst @@ -25,8 +25,8 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-" -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd" +PM_CL="/clr /MD /std:c++20" +PM_CL="/clr /MDd /std:c++20" PM_CL="/BE /c /EHsc /MD /std:c++latest /permissive-" PM_CL="/BE /c /EHsc /MDd /std:c++17 /permissive-" PM_CL="/BE /c /EHsc /MT /std:c++20 /permissive-" diff --git a/tests/std/tests/char8_t_impure_matrix.lst b/tests/std/tests/char8_t_impure_matrix.lst index 33d0825c945..d5a87b4e2c3 100644 --- a/tests/std/tests/char8_t_impure_matrix.lst +++ b/tests/std/tests/char8_t_impure_matrix.lst @@ -27,8 +27,8 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-" -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd" +PM_CL="/clr /MD /std:c++20" +PM_CL="/clr /MDd /std:c++20" PM_CL="/BE /c /EHsc /MD /std:c++14" PM_CL="/BE /c /EHsc /MDd /std:c++17 /permissive-" PM_CL="/BE /c /EHsc /MT /std:c++20 /permissive-" diff --git a/tests/std/tests/char8_t_matrix.lst b/tests/std/tests/char8_t_matrix.lst index 5c9cb3a7719..12d002c7609 100644 --- a/tests/std/tests/char8_t_matrix.lst +++ b/tests/std/tests/char8_t_matrix.lst @@ -24,8 +24,8 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive- /w14640 /Zc:threadSafeInit-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive /w14640 /Zc:threadSafeInit-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog- /w14640 /Zc:threadSafeInit-" -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd /w14640 /Zc:threadSafeInit-" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd /w14640 /Zc:threadSafeInit-" +PM_CL="/clr /MD /std:c++20 /w14640 /Zc:threadSafeInit-" +PM_CL="/clr /MDd /std:c++20 /w14640 /Zc:threadSafeInit-" PM_CL="/clr:pure /MD /std:c++14" PM_CL="/clr:pure /MDd /std:c++14" PM_CL="/BE /c /EHsc /MD /std:c++14 /w14640 /Zc:threadSafeInit-" diff --git a/tests/std/tests/clr_matrix.lst b/tests/std/tests/clr_matrix.lst index 9e5668a6fe4..b753e23fe33 100644 --- a/tests/std/tests/clr_matrix.lst +++ b/tests/std/tests/clr_matrix.lst @@ -5,5 +5,5 @@ RUNALL_INCLUDE .\prefix.lst RUNALL_CROSSLIST PM_CL="/w14640 /Zc:threadSafeInit-" RUNALL_CROSSLIST -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd" +PM_CL="/clr /MD /std:c++20" +PM_CL="/clr /MDd /std:c++20" diff --git a/tests/std/tests/concepts_20_matrix.lst b/tests/std/tests/concepts_20_matrix.lst index ec7d7229b95..7ce5f2b0e0c 100644 --- a/tests/std/tests/concepts_20_matrix.lst +++ b/tests/std/tests/concepts_20_matrix.lst @@ -21,8 +21,8 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-" -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd" +PM_CL="/clr /MD /std:c++20" +PM_CL="/clr /MDd /std:c++20" # PM_CL="/std:c++20 /permissive- /BE /c /EHsc /MD" # PM_CL="/std:c++latest /permissive- /BE /c /EHsc /MTd" PM_COMPILER="clang-cl" PM_CL="-fno-ms-compatibility -fno-delayed-template-parsing -Wno-unqualified-std-cast-call /EHsc /std:c++20 /permissive- /MD" diff --git a/tests/std/tests/impure_matrix.lst b/tests/std/tests/impure_matrix.lst index 3c745541a26..53e8bf46f1c 100644 --- a/tests/std/tests/impure_matrix.lst +++ b/tests/std/tests/impure_matrix.lst @@ -25,8 +25,8 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-" -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd" +PM_CL="/clr /MD /std:c++20" +PM_CL="/clr /MDd /std:c++20" PM_CL="/BE /c /EHsc /MD /std:c++14" PM_CL="/BE /c /EHsc /MDd /std:c++17 /permissive-" PM_CL="/BE /c /EHsc /MT /std:c++20 /permissive-" diff --git a/tests/std/tests/locale0_implib_cpp_matrix.lst b/tests/std/tests/locale0_implib_cpp_matrix.lst index 72ce91b0454..32992138ddc 100644 --- a/tests/std/tests/locale0_implib_cpp_matrix.lst +++ b/tests/std/tests/locale0_implib_cpp_matrix.lst @@ -20,13 +20,13 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive- /w14640 /Zc:threadSafeInit-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive /w14640 /Zc:threadSafeInit-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog- /w14640 /Zc:threadSafeInit-" -PM_CL="/clr /MD /D_ITERATOR_DEBUG_LEVEL=0 /std:c++20 /d1clrcxxstd /w14640 /Zc:threadSafeInit-" -PM_CL="/clr /MD /D_ITERATOR_DEBUG_LEVEL=1 /std:c++20 /d1clrcxxstd /w14640 /Zc:threadSafeInit-" -PM_CL="/clr /MDd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++20 /d1clrcxxstd /w14640 /Zc:threadSafeInit-" -PM_CL="/clr /MDd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++20 /d1clrcxxstd /w14640 /Zc:threadSafeInit-" -PM_CL="/clr /MDd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++20 /d1clrcxxstd /w14640 /Zc:threadSafeInit-" -PM_CL="/clr /MD /J /std:c++20 /d1clrcxxstd /w14640 /Zc:threadSafeInit-" -PM_CL="/clr /MDd /J /std:c++20 /d1clrcxxstd /w14640 /Zc:threadSafeInit-" +PM_CL="/clr /MD /D_ITERATOR_DEBUG_LEVEL=0 /std:c++20 /w14640 /Zc:threadSafeInit-" +PM_CL="/clr /MD /D_ITERATOR_DEBUG_LEVEL=1 /std:c++20 /w14640 /Zc:threadSafeInit-" +PM_CL="/clr /MDd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++20 /w14640 /Zc:threadSafeInit-" +PM_CL="/clr /MDd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++20 /w14640 /Zc:threadSafeInit-" +PM_CL="/clr /MDd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++20 /w14640 /Zc:threadSafeInit-" +PM_CL="/clr /MD /J /std:c++20 /w14640 /Zc:threadSafeInit-" +PM_CL="/clr /MDd /J /std:c++20 /w14640 /Zc:threadSafeInit-" PM_CL="/clr:pure /MD /std:c++14" PM_CL="/clr:pure /MDd /std:c++14" PM_CL="/BE /c /EHsc /MD /std:c++14 /w14640 /Zc:threadSafeInit-" diff --git a/tests/std/tests/strict_concepts_20_matrix.lst b/tests/std/tests/strict_concepts_20_matrix.lst index 66494679304..e8dd503d44f 100644 --- a/tests/std/tests/strict_concepts_20_matrix.lst +++ b/tests/std/tests/strict_concepts_20_matrix.lst @@ -20,8 +20,8 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /fp:strict" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /analyze:only /analyze:autolog-" -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd" +PM_CL="/clr /MD /std:c++20" +PM_CL="/clr /MDd /std:c++20" # PM_CL="/std:c++20 /BE /c /EHsc /MD" # PM_CL="/std:c++latest /BE /c /EHsc /MTd" PM_COMPILER="clang-cl" PM_CL="-fno-ms-compatibility -fno-delayed-template-parsing -Wno-unqualified-std-cast-call /EHsc /std:c++20 /MD" diff --git a/tests/std/tests/usual_17_matrix.lst b/tests/std/tests/usual_17_matrix.lst index 6828a04e29a..510cc46a999 100644 --- a/tests/std/tests/usual_17_matrix.lst +++ b/tests/std/tests/usual_17_matrix.lst @@ -24,8 +24,8 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-" -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd" +PM_CL="/clr /MD /std:c++20" +PM_CL="/clr /MDd /std:c++20" PM_CL="/BE /c /EHsc /MD /std:c++latest /permissive-" PM_CL="/BE /c /EHsc /MDd /std:c++17 /permissive-" PM_CL="/BE /c /EHsc /MT /std:c++20 /permissive-" diff --git a/tests/std/tests/usual_20_matrix.lst b/tests/std/tests/usual_20_matrix.lst index 7e031100690..c8aa8e8da23 100644 --- a/tests/std/tests/usual_20_matrix.lst +++ b/tests/std/tests/usual_20_matrix.lst @@ -18,8 +18,8 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-" -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd" +PM_CL="/clr /MD /std:c++20" +PM_CL="/clr /MDd /std:c++20" PM_CL="/BE /c /EHsc /MD /std:c++20 /permissive-" PM_CL="/BE /c /EHsc /MTd /std:c++latest /permissive-" PM_COMPILER="clang-cl" PM_CL="-fno-ms-compatibility -fno-delayed-template-parsing -Wno-unqualified-std-cast-call /EHsc /std:c++20 /permissive- /MD" diff --git a/tests/std/tests/usual_matrix.lst b/tests/std/tests/usual_matrix.lst index 689b83d4706..bde343a864b 100644 --- a/tests/std/tests/usual_matrix.lst +++ b/tests/std/tests/usual_matrix.lst @@ -24,8 +24,8 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /fp:stri PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive- /w14640 /Zc:threadSafeInit-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive /w14640 /Zc:threadSafeInit-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog- /w14640 /Zc:threadSafeInit-" -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd /w14640 /Zc:threadSafeInit-" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd /w14640 /Zc:threadSafeInit-" +PM_CL="/clr /MD /std:c++20 /w14640 /Zc:threadSafeInit-" +PM_CL="/clr /MDd /std:c++20 /w14640 /Zc:threadSafeInit-" PM_CL="/clr:pure /MD /std:c++14" PM_CL="/clr:pure /MDd /std:c++14" PM_CL="/BE /c /EHsc /MD /std:c++14 /w14640 /Zc:threadSafeInit-" diff --git a/tests/tr1/env.lst b/tests/tr1/env.lst index 164e32ef6d8..79741ab8a47 100644 --- a/tests/tr1/env.lst +++ b/tests/tr1/env.lst @@ -19,8 +19,8 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-" -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd" +PM_CL="/clr /MD /std:c++20" +PM_CL="/clr /MDd /std:c++20" PM_CL="/clr:pure /MD /std:c++14" PM_CL="/clr:pure /MDd /std:c++14" PM_CL="/BE /c /EHsc /MD /std:c++14" diff --git a/tests/tr1/env_minus_md_idl.lst b/tests/tr1/env_minus_md_idl.lst index 2f217abb1ba..52e2f6a4200 100644 --- a/tests/tr1/env_minus_md_idl.lst +++ b/tests/tr1/env_minus_md_idl.lst @@ -16,8 +16,8 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive- /w14640 PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive- /w14640 /Zc:threadSafeInit-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive /w14640 /Zc:threadSafeInit-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog- /w14640 /Zc:threadSafeInit-" -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd /w14640 /Zc:threadSafeInit-" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd /w14640 /Zc:threadSafeInit-" +PM_CL="/clr /MD /std:c++20 /w14640 /Zc:threadSafeInit-" +PM_CL="/clr /MDd /std:c++20 /w14640 /Zc:threadSafeInit-" PM_CL="/clr:pure /MD /std:c++14" PM_CL="/clr:pure /MDd /std:c++14" PM_CL="/BE /c /EHsc /MD /std:c++14 /w14640 /Zc:threadSafeInit-" diff --git a/tests/tr1/env_minus_pure.lst b/tests/tr1/env_minus_pure.lst index faac16a6d3c..5fa3a42b347 100644 --- a/tests/tr1/env_minus_pure.lst +++ b/tests/tr1/env_minus_pure.lst @@ -19,8 +19,8 @@ PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=0 /std:c++latest /permissive-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=1 /std:c++latest /permissive-" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive" PM_CL="/EHsc /MTd /D_ITERATOR_DEBUG_LEVEL=2 /std:c++latest /permissive- /analyze:only /analyze:autolog-" -PM_CL="/clr /MD /std:c++20 /d1clrcxxstd" -PM_CL="/clr /MDd /std:c++20 /d1clrcxxstd" +PM_CL="/clr /MD /std:c++20" +PM_CL="/clr /MDd /std:c++20" PM_CL="/BE /c /EHsc /MD /std:c++14" PM_CL="/BE /c /EHsc /MDd /std:c++17 /permissive-" PM_CL="/BE /c /EHsc /MTd /std:c++latest /permissive-"