From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 633EE385AC2B; Tue, 5 Oct 2021 14:57:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 633EE385AC2B MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-4190] libstdc++: Simplify constraints for std::any construction X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 824e0855732c601e0866d0e8a9264a85f758213e X-Git-Newrev: 6da36b7d0e43b6f9281c65c19a025d4888a25b2d Message-Id: <20211005145731.633EE385AC2B@sourceware.org> Date: Tue, 5 Oct 2021 14:57:31 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Oct 2021 14:57:31 -0000 https://gcc.gnu.org/g:6da36b7d0e43b6f9281c65c19a025d4888a25b2d commit r12-4190-g6da36b7d0e43b6f9281c65c19a025d4888a25b2d Author: Jonathan Wakely Date: Mon Oct 4 23:14:30 2021 +0100 libstdc++: Simplify constraints for std::any construction libstdc++-v3/ChangeLog: * include/bits/utility.h (__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. Diff: --- libstdc++-v3/include/bits/utility.h | 11 ++++------- libstdc++-v3/include/std/any | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/include/bits/utility.h b/libstdc++-v3/include/bits/utility.h index 96d350874d9..fce52a4530d 100644 --- a/libstdc++-v3/include/bits/utility.h +++ b/libstdc++-v3/include/bits/utility.h @@ -184,17 +184,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline constexpr in_place_index_t<_Idx> in_place_index{}; template - struct __is_in_place_type_impl : false_type - { }; + inline constexpr bool __is_in_place_type_v = false; template - struct __is_in_place_type_impl> : true_type - { }; + inline constexpr bool __is_in_place_type_v> = true; template - 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>>; + #endif // C++17 #endif // C++14 diff --git a/libstdc++-v3/include/std/any b/libstdc++-v3/include/std/any index 625cac619f0..e3d9d774de4 100644 --- a/libstdc++-v3/include/std/any +++ b/libstdc++-v3/include/std/any @@ -183,8 +183,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// Construct with a copy of @p __value as the contained object. template , typename _Mgr = _Manager<_VTp>, - enable_if_t::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) {