diff --git a/libstdc++-v3/include/std/any b/libstdc++-v3/include/std/any index 9c102a58b26..f75dddf6d92 100644 --- a/libstdc++-v3/include/std/any +++ b/libstdc++-v3/include/std/any @@ -428,16 +428,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// Exchange the states of two @c any objects. inline void swap(any& __x, any& __y) noexcept { __x.swap(__y); } - /// Create an any holding a @c _Tp constructed from @c __args. + /// Create an `any` holding a `_Tp` constructed from `__args...`. template - any make_any(_Args&&... __args) + inline + enable_if_t, _Args...>, any> + make_any(_Args&&... __args) { return any(in_place_type<_Tp>, std::forward<_Args>(__args)...); } - /// Create an any holding a @c _Tp constructed from @c __il and @c __args. + /// Create an `any` holding a `_Tp` constructed from `__il` and `__args...`. template - any make_any(initializer_list<_Up> __il, _Args&&... __args) + inline + enable_if_t, + initializer_list<_Up>&, _Args...>, any> + make_any(initializer_list<_Up> __il, _Args&&... __args) { return any(in_place_type<_Tp>, __il, std::forward<_Args>(__args)...); } diff --git a/libstdc++-v3/testsuite/20_util/any/102894.cc b/libstdc++-v3/testsuite/20_util/any/102894.cc new file mode 100644 index 00000000000..66ea9a03fea --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/any/102894.cc @@ -0,0 +1,20 @@ +// { dg-do compile { target c++17 } } +#include + +template +struct can_make_any +: std::false_type +{ }; + +template +struct can_make_any())>> +: std::true_type +{ }; + +struct move_only +{ + move_only() = default; + move_only(move_only&&) = default; +}; + +static_assert( ! can_make_any::value ); // PR libstdc++/102894