diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-10-04 23:14:30 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-11-24 11:25:00 +0000 |
| commit | 853b9d54365372e0926746ff939004389a8742aa (patch) | |
| tree | 0e5ba42290f9ad2f1ed9211d8e231e919b33da3c /libstdc++-v3 | |
| parent | a3044088b6dd87590468769ab68ecd2b47ce7b1c (diff) | |
| download | gcc-853b9d54365372e0926746ff939004389a8742aa.tar.gz | |
libstdc++: Simplify constraints for std::any construction
libstdc++-v3/ChangeLog:
* include/std/utility (__is_in_place_type_v): Define
variable template to detect in_place_type_t specializations.
(__is_in_place_type): Replace class template with alias
template using __is_in_place_type_v.
* include/std/any (any(T&&)): Check __is_in_place_type first and
avoid instantiating is_copy_constructible unnecessarily.
(cherry picked from commit 6da36b7d0e43b6f9281c65c19a025d4888a25b2d)
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/include/std/any | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/utility | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/libstdc++-v3/include/std/any b/libstdc++-v3/include/std/any index aae2b731d42..d96ea06c1ae 100644 --- a/libstdc++-v3/include/std/any +++ b/libstdc++-v3/include/std/any @@ -184,8 +184,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// Construct with a copy of @p __value as the contained object. template <typename _Tp, typename _VTp = _Decay_if_not_any<_Tp>, typename _Mgr = _Manager<_VTp>, - enable_if_t<is_copy_constructible<_VTp>::value - && !__is_in_place_type<_VTp>::value, bool> = true> + typename = _Require<__not_<__is_in_place_type<_VTp>>, + is_copy_constructible<_VTp>>> any(_Tp&& __value) : _M_manager(&_Mgr::_S_manage) { diff --git a/libstdc++-v3/include/std/utility b/libstdc++-v3/include/std/utility index 3e68f682e00..f54f75b4d38 100644 --- a/libstdc++-v3/include/std/utility +++ b/libstdc++-v3/include/std/utility @@ -372,17 +372,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline constexpr in_place_index_t<_Idx> in_place_index{}; template<typename> - struct __is_in_place_type_impl : false_type - { }; + inline constexpr bool __is_in_place_type_v = false; template<typename _Tp> - struct __is_in_place_type_impl<in_place_type_t<_Tp>> : true_type - { }; + inline constexpr bool __is_in_place_type_v<in_place_type_t<_Tp>> = true; template<typename _Tp> - struct __is_in_place_type - : public __is_in_place_type_impl<_Tp> - { }; + using __is_in_place_type = bool_constant<__is_in_place_type_v<_Tp>>; #define __cpp_lib_as_const 201510 template<typename _Tp> |