From 14f26c75d255ef05b706a12d25b003da8a2f5b45 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 14 Jun 2021 14:18:33 +0100 Subject: [PATCH] libstdc++: Fix std::any constraints [PR101034] PR libstdc++/101034 libstdc++-v3/ChangeLog: * include/std/any (any(in_place_t, initializer_list, A&&...)) (any::emplace(initializer_list, A&&...)): Fix constraint to use lvalue. * testsuite/20_util/any/cons/101034.cc: New test. --- libstdc++-v3/include/std/any | 4 ++-- libstdc++-v3/testsuite/20_util/any/cons/101034.cc | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/any/cons/101034.cc diff --git a/libstdc++-v3/include/std/any b/libstdc++-v3/include/std/any index 21120a9146f9..a6995b79c432 100644 --- a/libstdc++-v3/include/std/any +++ b/libstdc++-v3/include/std/any @@ -205,7 +205,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// the contained object. template , typename _Mgr = _Manager<_VTp>, - __any_constructible_t<_VTp, initializer_list<_Up>, + __any_constructible_t<_VTp, initializer_list<_Up>&, _Args&&...> = false> explicit any(in_place_type_t<_Tp>, initializer_list<_Up> __il, _Args&&... __args) @@ -269,7 +269,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// Emplace with an object created from @p __il and @p __args as /// the contained object. template - __emplace_t, initializer_list<_Up>, _Args&&...> + __emplace_t, initializer_list<_Up>&, _Args&&...> emplace(initializer_list<_Up> __il, _Args&&... __args) { using _VTp = decay_t<_Tp>; diff --git a/libstdc++-v3/testsuite/20_util/any/cons/101034.cc b/libstdc++-v3/testsuite/20_util/any/cons/101034.cc new file mode 100644 index 000000000000..55f550a839e7 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/any/cons/101034.cc @@ -0,0 +1,11 @@ +// { dg-do compile { target c++17 } } +// PR libstdc++/101034 - wrong constraint in std::any's constructor + +#include + +struct S { + S(std::initializer_list&, int) {} +}; + +std::any a(std::in_place_type, {0}, 0); +S& s = a.emplace({0}, 0); -- 2.47.2