OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Fix std::any constraints [PR101034]

Browse Source 
PR libstdc++/101034

libstdc++-v3/ChangeLog:

	* include/std/any (any(in_place_t<T>, initializer_list<U>, A&&...))
	(any::emplace<T>(initializer_list<U>, A&&...)): Fix constraint
	to use lvalue.
	* testsuite/20_util/any/cons/101034.cc: New test.

(cherry picked from commit 14f26c75d2)
This commit is contained in:
Jonathan Wakely 2021-06-14 14:18:33 +01:00
parent 2280fbfa46
commit 028fd30231
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libstdc++-v3/include/std/any
View File

@ -205,7 +205,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// the contained object.
template <typename _Tp, typename _Up, typename... _Args,
typename _VTp = decay_t<_Tp>, 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)
@ -271,7 +271,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// Emplace with an object created from @p __il and @p __args as
/// the contained object.
template <typename _Tp, typename _Up, typename... _Args>
__emplace_t<decay_t<_Tp>, initializer_list<_Up>, _Args&&...>
__emplace_t<decay_t<_Tp>, initializer_list<_Up>&, _Args&&...>
emplace(initializer_list<_Up> __il, _Args&&... __args)
{
using _VTp = decay_t<_Tp>;

11
libstdc++-v3/testsuite/20_util/any/cons/101034.cc Normal file
View File

@ -0,0 +1,11 @@
// { dg-do compile { target c++17 } }
// PR libstdc++/101034 - wrong constraint in std::any's constructor
#include <any>
struct S {
S(std::initializer_list<int>&, int) {}
};
std::any a(std::in_place_type<S>, {0}, 0);
S& s = a.emplace<S>({0}, 0);