From a9a7d6494b37155990d0407e15550e3774bb0ec6 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Sun, 13 Jun 2021 21:53:31 +0700 Subject: [PATCH 1/8] implement P1951R1 --- stl/inc/utility | 6 +++--- tests/std/test.lst | 1 + .../env.lst | 4 ++++ .../test.cpp | 11 +++++++++++ 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/env.lst create mode 100644 tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/test.cpp diff --git a/stl/inc/utility b/stl/inc/utility index a909684b495..df6c1ca66f6 100644 --- a/stl/inc/utility +++ b/stl/inc/utility @@ -185,14 +185,14 @@ struct pair { // store a pair of values #endif // ^^^ !_HAS_CONDITIONAL_EXPLICIT ^^^ #if _HAS_CONDITIONAL_EXPLICIT - template , is_constructible<_Ty2, _Other2>>, int> = 0> constexpr explicit(!conjunction_v, is_convertible<_Other2, _Ty2>>) pair(_Other1&& _Val1, _Other2&& _Val2) noexcept( is_nothrow_constructible_v<_Ty1, _Other1>&& is_nothrow_constructible_v<_Ty2, _Other2>) // strengthened : first(_STD forward<_Other1>(_Val1)), second(_STD forward<_Other2>(_Val2)) {} #else // ^^^ _HAS_CONDITIONAL_EXPLICIT ^^^ / vvv !_HAS_CONDITIONAL_EXPLICIT vvv - template , is_constructible<_Ty2, _Other2>, is_convertible<_Other1, _Ty1>, is_convertible<_Other2, _Ty2>>, int> = 0> @@ -200,7 +200,7 @@ struct pair { // store a pair of values is_nothrow_constructible_v<_Ty1, _Other1>&& is_nothrow_constructible_v<_Ty2, _Other2>) // strengthened : first(_STD forward<_Other1>(_Val1)), second(_STD forward<_Other2>(_Val2)) {} - template , is_constructible<_Ty2, _Other2>, negation, is_convertible<_Other2, _Ty2>>>>, int> = 0> diff --git a/tests/std/test.lst b/tests/std/test.lst index cba3615d387..a56d93dd3a7 100644 --- a/tests/std/test.lst +++ b/tests/std/test.lst @@ -419,6 +419,7 @@ tests\P1423R3_char8_t_remediation tests\P1502R1_standard_library_header_units tests\P1614R2_spaceship tests\P1645R1_constexpr_numeric +tests\P1951R1_default_arguments_pair_forward_ctor tests\VSO_0000000_allocator_propagation tests\VSO_0000000_any_calling_conventions tests\VSO_0000000_c_math_functions diff --git a/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/env.lst b/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/env.lst new file mode 100644 index 00000000000..351a8293d9d --- /dev/null +++ b/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/env.lst @@ -0,0 +1,4 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception + +RUNALL_INCLUDE ..\usual_20_matrix.lst diff --git a/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/test.cpp b/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/test.cpp new file mode 100644 index 00000000000..7b47143cc2b --- /dev/null +++ b/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/test.cpp @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception + +#include +#include + +using namespace std; + +int main() { + pair> p{42, {}}; +} From 362864a1cd7cfc3700771904a31037457fd6c5a5 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Sun, 13 Jun 2021 22:05:32 +0700 Subject: [PATCH 2/8] add comment about implementing P1951R1 unconditionally --- stl/inc/yvals_core.h | 1 + 1 file changed, 1 insertion(+) diff --git a/stl/inc/yvals_core.h b/stl/inc/yvals_core.h index 66a66b4464a..b761e874bcf 100644 --- a/stl/inc/yvals_core.h +++ b/stl/inc/yvals_core.h @@ -61,6 +61,7 @@ // P1164R1 Making create_directory() Intuitive // P1165R1 Consistently Propagating Stateful Allocators In basic_string's operator+() // P1902R1 Missing Feature-Test Macros 2017-2019 +// P1951R1 Default Template Arguments For pair's Forwarding Constructor // _HAS_CXX17 directly controls: // P0005R4 not_fn() From 865870021c2fbd401debb9ffbc573c89d5b32cde Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Sun, 13 Jun 2021 23:06:56 +0700 Subject: [PATCH 3/8] convert test to compile-only --- .../{test.cpp => test.compile.pass.cpp} | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) rename tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/{test.cpp => test.compile.pass.cpp} (73%) diff --git a/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/test.cpp b/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/test.compile.pass.cpp similarity index 73% rename from tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/test.cpp rename to tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/test.compile.pass.cpp index 7b47143cc2b..6030e15b256 100644 --- a/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/test.cpp +++ b/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/test.compile.pass.cpp @@ -6,6 +6,9 @@ using namespace std; -int main() { +void test() { pair> p{42, {}}; + (void) p; } + +int main() {} // COMPILE-ONLY From 3bbc614e43ac7709ae407b1b84056a37d2fd6ce7 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Sun, 13 Jun 2021 23:08:59 +0700 Subject: [PATCH 4/8] fix P0067R5_charconv tests --- tests/std/tests/P0067R5_charconv/test.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/std/tests/P0067R5_charconv/test.cpp b/tests/std/tests/P0067R5_charconv/test.cpp index 8eaf8e2a9b2..6723b9f3ea1 100644 --- a/tests/std/tests/P0067R5_charconv/test.cpp +++ b/tests/std/tests/P0067R5_charconv/test.cpp @@ -210,8 +210,8 @@ constexpr const char* output_max_digit[] = {"skip0", "skip1", "11", "12", "13", "1t", "1u", "1v", "1w", "1x", "1y", "1z"}; // https://www.wolframalpha.com : Table[BaseForm[k, n], {k, {MEOW, MEOW, MEOW}}, {n, 2, 36}] -constexpr uint64_t stress_chunks_positive = 12000000345000678900ULL; -constexpr pair> output_positive[] = { +constexpr uint64_t stress_chunks_positive = 12000000345000678900ULL; +_Pragma("warning(disable:4365)") constexpr pair> output_positive[] = { {123, {{"skip0", "skip1", "1111011", "11120", "1323", "443", "323", "234", "173", "146", "123", "102", "a3", "96", "8b", "83", "7b", "74", "6f", "69", "63", "5i", "5d", "58", "53", "4n", "4j", "4f", "4b", "47", "43", "3u", "3r", "3o", "3l", "3i", "3f"}}}, @@ -311,9 +311,10 @@ constexpr pair> output_positive[] = { "4eo8hfam6fllmo", "2nc6j26l66rhof", "1n3rsh11f098rn", "14l9lkmo30o40f", "nd075ib45k86f", "fvvvvvvvvvvvv", "b1w8p7j5q9r6f", "7orp63sh4dphh", "5g24a25twkwff", "3w5e11264sgsf"}}}, }; +_Pragma("warning(default:4365)") -// https://www.wolframalpha.com : Table[BaseForm[k, n], {k, {MEOW, MEOW, MEOW}}, {n, 2, 36}] -constexpr int64_t stress_chunks_negative = -9000876000000054321LL; + // https://www.wolframalpha.com : Table[BaseForm[k, n], {k, {MEOW, MEOW, MEOW}}, {n, 2, 36}] + constexpr int64_t stress_chunks_negative = -9000876000000054321LL; constexpr pair> output_negative[] = { {-85, {{"skip0", "skip1", "-1010101", "-10011", "-1111", "-320", "-221", "-151", "-125", "-104", "-85", "-78", "-71", "-67", "-61", "-5a", "-55", "-50", "-4d", "-49", "-45", "-41", "-3j", "-3g", "-3d", "-3a", "-37", From c3c182bae68f5eb907ca91cc251385e4973b3408 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Sun, 13 Jun 2021 23:33:44 +0700 Subject: [PATCH 5/8] better fix P0067R5_charconv --- tests/std/tests/P0067R5_charconv/test.cpp | 63 +++++++++++------------ 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/tests/std/tests/P0067R5_charconv/test.cpp b/tests/std/tests/P0067R5_charconv/test.cpp index 6723b9f3ea1..d58194240fe 100644 --- a/tests/std/tests/P0067R5_charconv/test.cpp +++ b/tests/std/tests/P0067R5_charconv/test.cpp @@ -210,41 +210,41 @@ constexpr const char* output_max_digit[] = {"skip0", "skip1", "11", "12", "13", "1t", "1u", "1v", "1w", "1x", "1y", "1z"}; // https://www.wolframalpha.com : Table[BaseForm[k, n], {k, {MEOW, MEOW, MEOW}}, {n, 2, 36}] -constexpr uint64_t stress_chunks_positive = 12000000345000678900ULL; -_Pragma("warning(disable:4365)") constexpr pair> output_positive[] = { - {123, {{"skip0", "skip1", "1111011", "11120", "1323", "443", "323", "234", "173", "146", "123", "102", "a3", "96", - "8b", "83", "7b", "74", "6f", "69", "63", "5i", "5d", "58", "53", "4n", "4j", "4f", "4b", "47", "43", - "3u", "3r", "3o", "3l", "3i", "3f"}}}, - {INT8_MAX, {{"skip0", "skip1", "1111111", "11201", "1333", "1002", "331", "241", "177", "151", "127", "106", "a7", - "9a", "91", "87", "7f", "78", "71", "6d", "67", "61", "5h", "5c", "57", "52", "4n", "4j", "4f", "4b", - "47", "43", "3v", "3s", "3p", "3m", "3j"}}}, - {161, {{"skip0", "skip1", "10100001", "12222", "2201", "1121", "425", "320", "241", "188", "161", "137", "115", - "c5", "b7", "ab", "a1", "98", "8h", "89", "81", "7e", "77", "70", "6h", "6b", "65", "5q", "5l", "5g", - "5b", "56", "51", "4t", "4p", "4l", "4h"}}}, +constexpr uint64_t stress_chunks_positive = 12000000345000678900ULL; +constexpr pair> output_positive[] = { + {123U, {{"skip0", "skip1", "1111011", "11120", "1323", "443", "323", "234", "173", "146", "123", "102", "a3", "96", + "8b", "83", "7b", "74", "6f", "69", "63", "5i", "5d", "58", "53", "4n", "4j", "4f", "4b", "47", "43", + "3u", "3r", "3o", "3l", "3i", "3f"}}}, + {uint64_t{INT8_MAX}, {{"skip0", "skip1", "1111111", "11201", "1333", "1002", "331", "241", "177", "151", "127", + "106", "a7", "9a", "91", "87", "7f", "78", "71", "6d", "67", "61", "5h", "5c", "57", "52", + "4n", "4j", "4f", "4b", "47", "43", "3v", "3s", "3p", "3m", "3j"}}}, + {161U, {{"skip0", "skip1", "10100001", "12222", "2201", "1121", "425", "320", "241", "188", "161", "137", "115", + "c5", "b7", "ab", "a1", "98", "8h", "89", "81", "7e", "77", "70", "6h", "6b", "65", "5q", "5l", "5g", + "5b", "56", "51", "4t", "4p", "4l", "4h"}}}, {UINT8_MAX, {{"skip0", "skip1", "11111111", "100110", "3333", "2010", "1103", "513", "377", "313", "255", "212", "193", "168", "143", "120", "ff", "f0", "e3", "d8", "cf", "c3", "bd", "b2", "af", "a5", "9l", "9c", "93", "8n", "8f", "87", "7v", "7o", "7h", "7a", "73"}}}, - {1729, {{"skip0", "skip1", "11011000001", "2101001", "123001", "23404", "12001", "5020", "3301", "2331", "1729", - "1332", "1001", "a30", "8b7", "7a4", "6c1", "5gc", "561", "4f0", "469", "3j7", "3cd", "364", "301", - "2j4", "2ed", "2a1", "25l", "21i", "1rj", "1oo", "1m1", "1jd", "1gt", "1ee", "1c1"}}}, - {INT16_MAX, {{"skip0", "skip1", "111111111111111", "1122221121", "13333333", "2022032", "411411", "164350", "77777", - "48847", "32767", "22689", "16b67", "11bb7", "bd27", "9a97", "7fff", "6b68", "5b27", "4eeb", "41i7", - "3b67", "31f9", "2flf", "28l7", "22ah", "1mc7", "1hpg", "1dm7", "19rq", "16c7", "1330", "vvv", - "u2v", "sbp", "qq7", "pa7"}}}, - {57494, {{"skip0", "skip1", "1110000010010110", "2220212102", "32002112", "3314434", "1122102", "326423", "160226", - "86772", "57494", "3a218", "29332", "20228", "16d4a", "1207e", "e096", "bbg0", "9f82", "8750", "73ee", - "647h", "58h8", "4gfh", "43je", "3goj", "3718", "2onb", "2h9a", "2aag", "23qe", "1spk", "1o4m", "1jq8", - "1fp0", "1bwo", "18d2"}}}, + {1729U, {{"skip0", "skip1", "11011000001", "2101001", "123001", "23404", "12001", "5020", "3301", "2331", "1729", + "1332", "1001", "a30", "8b7", "7a4", "6c1", "5gc", "561", "4f0", "469", "3j7", "3cd", "364", "301", + "2j4", "2ed", "2a1", "25l", "21i", "1rj", "1oo", "1m1", "1jd", "1gt", "1ee", "1c1"}}}, + {uint64_t{INT16_MAX}, {{"skip0", "skip1", "111111111111111", "1122221121", "13333333", "2022032", "411411", + "164350", "77777", "48847", "32767", "22689", "16b67", "11bb7", "bd27", "9a97", "7fff", + "6b68", "5b27", "4eeb", "41i7", "3b67", "31f9", "2flf", "28l7", "22ah", "1mc7", "1hpg", + "1dm7", "19rq", "16c7", "1330", "vvv", "u2v", "sbp", "qq7", "pa7"}}}, + {57494U, {{"skip0", "skip1", "1110000010010110", "2220212102", "32002112", "3314434", "1122102", "326423", "160226", + "86772", "57494", "3a218", "29332", "20228", "16d4a", "1207e", "e096", "bbg0", "9f82", "8750", "73ee", + "647h", "58h8", "4gfh", "43je", "3goj", "3718", "2onb", "2h9a", "2aag", "23qe", "1spk", "1o4m", "1jq8", + "1fp0", "1bwo", "18d2"}}}, {UINT16_MAX, {{"skip0", "skip1", "1111111111111111", "10022220020", "33333333", "4044120", "1223223", "362031", "177777", "108806", "65535", "45268", "31b13", "23aa2", "19c51", "14640", "ffff", "d5d0", "b44f", "9aa4", "83gf", "71cf", "638j", "58k8", "4hif", "44la", "3iof", "38o6", "2rgf", "2jqo", "2cof", "2661", "1vvv", "1r5u", "1mnh", "1ihf", "1ekf"}}}, - {71125478, {{"skip0", "skip1", "100001111010100100111100110", "11221211112210222", "10033110213212", "121202003403", - "11020244342", "1522361624", "417244746", "157745728", "71125478", "3716a696", "1b9a06b2", - "11973ba8", "9636514", "639e338", "43d49e6", "2g19gfb", "21b9d18", "19dec94", "124addi", "h8f25b", - "dhdfa6", "b13hg2", "8m91he", "7720j3", "5pgj58", "4pmelq", "43k17i", "3dg8ek", "2ro898", "2f0et8", - "23qif6", "1qw5lh", "1j7l7s", "1cdvli", "16cgrq"}}}, - {INT32_MAX, + {71125478U, {{"skip0", "skip1", "100001111010100100111100110", "11221211112210222", "10033110213212", + "121202003403", "11020244342", "1522361624", "417244746", "157745728", "71125478", "3716a696", + "1b9a06b2", "11973ba8", "9636514", "639e338", "43d49e6", "2g19gfb", "21b9d18", "19dec94", "124addi", + "h8f25b", "dhdfa6", "b13hg2", "8m91he", "7720j3", "5pgj58", "4pmelq", "43k17i", "3dg8ek", "2ro898", + "2f0et8", "23qif6", "1qw5lh", "1j7l7s", "1cdvli", "16cgrq"}}}, + {uint64_t{INT32_MAX}, {{"skip0", "skip1", "1111111111111111111111111111111", "12112122212110202101", "1333333333333333", "13344223434042", "553032005531", "104134211161", "17777777777", "5478773671", "2147483647", "a02220281", "4bb2308a7", "282ba4aaa", "1652ca931", "c87e66b7", "7fffffff", "53g7f548", "3928g3h1", "27c57h32", @@ -270,7 +270,7 @@ _Pragma("warning(disable:4365)") constexpr pair "4d0d5e232c53", "2d63h403i580", "1bf5h8185hdj", "kc3g550fkcg", "d41id5k9984", "8ef5n0him4g", "5i2dijfe1la", "3me22fm5fhi", "2hfmhgg73kd", "1ngpfabr53c", "18i7220bh11", "rm0lcjngpa", "kk1elesni1", "fgfge3c3fg", "bp4q5l6bjg", "8xna46jp0k", "6wejomvji5", "5di2s1qhv4"}}}, - {INT64_MAX, + {uint64_t{INT64_MAX}, {{"skip0", "skip1", "111111111111111111111111111111111111111111111111111111111111111", "2021110011022210012102010021220101220221", "13333333333333333333333333333333", "1104332401304422434310311212", "1540241003031030222122211", "22341010611245052052300", @@ -311,10 +311,9 @@ _Pragma("warning(disable:4365)") constexpr pair "4eo8hfam6fllmo", "2nc6j26l66rhof", "1n3rsh11f098rn", "14l9lkmo30o40f", "nd075ib45k86f", "fvvvvvvvvvvvv", "b1w8p7j5q9r6f", "7orp63sh4dphh", "5g24a25twkwff", "3w5e11264sgsf"}}}, }; -_Pragma("warning(default:4365)") - // https://www.wolframalpha.com : Table[BaseForm[k, n], {k, {MEOW, MEOW, MEOW}}, {n, 2, 36}] - constexpr int64_t stress_chunks_negative = -9000876000000054321LL; +// https://www.wolframalpha.com : Table[BaseForm[k, n], {k, {MEOW, MEOW, MEOW}}, {n, 2, 36}] +constexpr int64_t stress_chunks_negative = -9000876000000054321LL; constexpr pair> output_negative[] = { {-85, {{"skip0", "skip1", "-1010101", "-10011", "-1111", "-320", "-221", "-151", "-125", "-104", "-85", "-78", "-71", "-67", "-61", "-5a", "-55", "-50", "-4d", "-49", "-45", "-41", "-3j", "-3g", "-3d", "-3a", "-37", From e78acab612850f1c72ed86af86b1a9e2fb2dd054 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Tue, 22 Jun 2021 14:05:32 +0700 Subject: [PATCH 6/8] use usual_matrix --- .../tests/P1951R1_default_arguments_pair_forward_ctor/env.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/env.lst b/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/env.lst index 351a8293d9d..19f025bd0e6 100644 --- a/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/env.lst +++ b/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/env.lst @@ -1,4 +1,4 @@ # Copyright (c) Microsoft Corporation. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -RUNALL_INCLUDE ..\usual_20_matrix.lst +RUNALL_INCLUDE ..\usual_matrix.lst From 9f72459bc6cc51900cb2d2e36df8abf158136ff3 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Wed, 23 Jun 2021 16:24:56 +0700 Subject: [PATCH 7/8] add more tests --- .../test.compile.pass.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/test.compile.pass.cpp b/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/test.compile.pass.cpp index 6030e15b256..8abe924e261 100644 --- a/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/test.compile.pass.cpp +++ b/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/test.compile.pass.cpp @@ -7,8 +7,12 @@ using namespace std; void test() { - pair> p{42, {}}; - (void) p; + pair> p1{42, {}}; + pair, int> p2{{}, 42}; + pair, unique_ptr> p3{{}, {}}; + (void) p1; + (void) p2; + (void) p3; } int main() {} // COMPILE-ONLY From 79d8716ef06022f431754656c091d0c30e43f057 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Tue, 27 Jul 2021 20:39:48 -0700 Subject: [PATCH 8/8] Guard this feature for C++23. --- stl/inc/utility | 11 ++++++++--- stl/inc/yvals_core.h | 2 +- .../env.lst | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/stl/inc/utility b/stl/inc/utility index bac31baeb9f..6031c165cec 100644 --- a/stl/inc/utility +++ b/stl/inc/utility @@ -185,14 +185,19 @@ struct pair { // store a pair of values #endif // ^^^ !_HAS_CONDITIONAL_EXPLICIT ^^^ #if _HAS_CONDITIONAL_EXPLICIT +#if _HAS_CXX23 template , is_constructible<_Ty2, _Other2>>, int> = 0> constexpr explicit(!conjunction_v, is_convertible<_Other2, _Ty2>>) pair(_Other1&& _Val1, _Other2&& _Val2) noexcept( is_nothrow_constructible_v<_Ty1, _Other1>&& is_nothrow_constructible_v<_Ty2, _Other2>) // strengthened - : first(_STD forward<_Other1>(_Val1)), second(_STD forward<_Other2>(_Val2)) {} + : first(_STD forward<_Other1>(_Val1)), second(_STD forward<_Other2>(_Val2)) { + } #else // ^^^ _HAS_CONDITIONAL_EXPLICIT ^^^ / vvv !_HAS_CONDITIONAL_EXPLICIT vvv - template , is_constructible<_Ty2, _Other2>, is_convertible<_Other1, _Ty1>, is_convertible<_Other2, _Ty2>>, int> = 0> @@ -200,7 +205,7 @@ struct pair { // store a pair of values is_nothrow_constructible_v<_Ty1, _Other1>&& is_nothrow_constructible_v<_Ty2, _Other2>) // strengthened : first(_STD forward<_Other1>(_Val1)), second(_STD forward<_Other2>(_Val2)) {} - template , is_constructible<_Ty2, _Other2>, negation, is_convertible<_Other2, _Ty2>>>>, int> = 0> diff --git a/stl/inc/yvals_core.h b/stl/inc/yvals_core.h index caf6b39829f..48d0631aa23 100644 --- a/stl/inc/yvals_core.h +++ b/stl/inc/yvals_core.h @@ -61,7 +61,6 @@ // P1164R1 Making create_directory() Intuitive // P1165R1 Consistently Propagating Stateful Allocators In basic_string's operator+() // P1902R1 Missing Feature-Test Macros 2017-2019 -// P1951R1 Default Template Arguments For pair's Forwarding Constructor // _HAS_CXX17 directly controls: // P0005R4 not_fn() @@ -264,6 +263,7 @@ // P1048R1 is_scoped_enum // P1679R3 contains() For basic_string/basic_string_view // P1682R3 to_underlying() For Enumerations +// P1951R1 Default Template Arguments For pair's Forwarding Constructor // P1989R2 Range Constructor For string_view // P2166R1 Prohibiting basic_string And basic_string_view Construction From nullptr // P2186R2 Removing Garbage Collection Support diff --git a/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/env.lst b/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/env.lst index 19f025bd0e6..642f530ffad 100644 --- a/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/env.lst +++ b/tests/std/tests/P1951R1_default_arguments_pair_forward_ctor/env.lst @@ -1,4 +1,4 @@ # Copyright (c) Microsoft Corporation. # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -RUNALL_INCLUDE ..\usual_matrix.lst +RUNALL_INCLUDE ..\usual_latest_matrix.lst