diff mbox series

libstdc++: use __bool_constant instead of integral_constant

Message ID	20230323110608.42262-1-kmatsui@cs.washington.edu
State	Accepted
Headers	Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0CFDB3858C31 To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Jonathan Wakely <jwakely@redhat.com>, ville.voutilainen@gmail.com, Ken Matsui <kmatsui@cs.washington.edu> Subject: [PATCH] libstdc++: use __bool_constant instead of integral_constant Date: Thu, 23 Mar 2023 04:06:08 -0700 Message-Id: <20230323110608.42262-1-kmatsui@cs.washington.edu> In-Reply-To: <CAML+3pXgiJ93E=16mDnhMBaYy1RETKkqw9G8YA+BNFMxuG8eng@mail.gmail.com> References: <CAML+3pXgiJ93E=16mDnhMBaYy1RETKkqw9G8YA+BNFMxuG8eng@mail.gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list From: Ken Matsui via Gcc-patches <gcc-patches@gcc.gnu.org> Reply-To: Ken Matsui <kmatsui@cs.washington.edu> Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org> X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
Series	libstdc++: use __bool_constant instead of integral_constant \| libstdc++: use __bool_constant instead of integral_constant

Checks

Context	Check	Description
snail/gcc-patch-check	success	Github commit url

Commit Message

Ken Matsui March 23, 2023, 11:06 a.m. UTC

  In the type_traits header, both integral_constant<bool> and __bool_constant
are used. This patch unifies those usages into __bool_constant.

libstdc++-v3/ChangeLog:

	* include/std/type_traits: Use __bool_constant instead of
	integral_constant.

Signed-off-by: Ken Matsui <kmatsui@cs.washington.edu>
---
 libstdc++-v3/include/std/type_traits | 32 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

Comments

Ken Matsui April 8, 2023, 1:02 a.m. UTC | #1

Ping for this patch.

On Thu, Mar 23, 2023 at 4:06 AM Ken Matsui <kmatsui@cs.washington.edu> wrote:
>
> In the type_traits header, both integral_constant<bool> and __bool_constant
> are used. This patch unifies those usages into __bool_constant.
>
> libstdc++-v3/ChangeLog:
>
>         * include/std/type_traits: Use __bool_constant instead of
>         integral_constant.
>
> Signed-off-by: Ken Matsui <kmatsui@cs.washington.edu>
> ---
>  libstdc++-v3/include/std/type_traits | 32 ++++++++++++++--------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
> index 2bd607a8b8f..bc6982f9e64 100644
> --- a/libstdc++-v3/include/std/type_traits
> +++ b/libstdc++-v3/include/std/type_traits
> @@ -578,19 +578,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// is_enum
>    template<typename _Tp>
>      struct is_enum
> -    : public integral_constant<bool, __is_enum(_Tp)>
> +    : public __bool_constant<__is_enum(_Tp)>
>      { };
>
>    /// is_union
>    template<typename _Tp>
>      struct is_union
> -    : public integral_constant<bool, __is_union(_Tp)>
> +    : public __bool_constant<__is_union(_Tp)>
>      { };
>
>    /// is_class
>    template<typename _Tp>
>      struct is_class
> -    : public integral_constant<bool, __is_class(_Tp)>
> +    : public __bool_constant<__is_class(_Tp)>
>      { };
>
>    /// is_function
> @@ -784,7 +784,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// is_trivial
>    template<typename _Tp>
>      struct is_trivial
> -    : public integral_constant<bool, __is_trivial(_Tp)>
> +    : public __bool_constant<__is_trivial(_Tp)>
>      {
>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>         "template argument must be a complete class or an unbounded array");
> @@ -793,7 +793,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// is_trivially_copyable
>    template<typename _Tp>
>      struct is_trivially_copyable
> -    : public integral_constant<bool, __is_trivially_copyable(_Tp)>
> +    : public __bool_constant<__is_trivially_copyable(_Tp)>
>      {
>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>         "template argument must be a complete class or an unbounded array");
> @@ -802,7 +802,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// is_standard_layout
>    template<typename _Tp>
>      struct is_standard_layout
> -    : public integral_constant<bool, __is_standard_layout(_Tp)>
> +    : public __bool_constant<__is_standard_layout(_Tp)>
>      {
>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>         "template argument must be a complete class or an unbounded array");
> @@ -817,7 +817,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>      struct
>      _GLIBCXX20_DEPRECATED_SUGGEST("is_standard_layout && is_trivial")
>      is_pod
> -    : public integral_constant<bool, __is_pod(_Tp)>
> +    : public __bool_constant<__is_pod(_Tp)>
>      {
>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>         "template argument must be a complete class or an unbounded array");
> @@ -831,7 +831,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>      struct
>      _GLIBCXX17_DEPRECATED
>      is_literal_type
> -    : public integral_constant<bool, __is_literal_type(_Tp)>
> +    : public __bool_constant<__is_literal_type(_Tp)>
>      {
>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>         "template argument must be a complete class or an unbounded array");
> @@ -840,13 +840,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// is_empty
>    template<typename _Tp>
>      struct is_empty
> -    : public integral_constant<bool, __is_empty(_Tp)>
> +    : public __bool_constant<__is_empty(_Tp)>
>      { };
>
>    /// is_polymorphic
>    template<typename _Tp>
>      struct is_polymorphic
> -    : public integral_constant<bool, __is_polymorphic(_Tp)>
> +    : public __bool_constant<__is_polymorphic(_Tp)>
>      { };
>
>  #if __cplusplus >= 201402L
> @@ -855,14 +855,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// @since C++14
>    template<typename _Tp>
>      struct is_final
> -    : public integral_constant<bool, __is_final(_Tp)>
> +    : public __bool_constant<__is_final(_Tp)>
>      { };
>  #endif
>
>    /// is_abstract
>    template<typename _Tp>
>      struct is_abstract
> -    : public integral_constant<bool, __is_abstract(_Tp)>
> +    : public __bool_constant<__is_abstract(_Tp)>
>      { };
>
>    /// @cond undocumented
> @@ -873,7 +873,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>
>    template<typename _Tp>
>      struct __is_signed_helper<_Tp, true>
> -    : public integral_constant<bool, _Tp(-1) < _Tp(0)>
> +    : public __bool_constant<_Tp(-1) < _Tp(0)>
>      { };
>    /// @endcond
>
> @@ -1333,7 +1333,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// has_virtual_destructor
>    template<typename _Tp>
>      struct has_virtual_destructor
> -    : public integral_constant<bool, __has_virtual_destructor(_Tp)>
> +    : public __bool_constant<__has_virtual_destructor(_Tp)>
>      {
>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>         "template argument must be a complete class or an unbounded array");
> @@ -1392,7 +1392,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    template<typename _Tp, typename _Up>
>      struct is_same
>  #ifdef _GLIBCXX_HAVE_BUILTIN_IS_SAME
> -    : public integral_constant<bool, __is_same(_Tp, _Up)>
> +    : public __bool_constant<__is_same(_Tp, _Up)>
>  #else
>      : public false_type
>  #endif
> @@ -1408,7 +1408,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// is_base_of
>    template<typename _Base, typename _Derived>
>      struct is_base_of
> -    : public integral_constant<bool, __is_base_of(_Base, _Derived)>
> +    : public __bool_constant<__is_base_of(_Base, _Derived)>
>      { };
>
>  #if __has_builtin(__is_convertible)
> --
> 2.40.0
>

Jonathan Wakely April 8, 2023, 7:52 a.m. UTC | #2

This looks good, thanks, but we're too close to the gcc 13 release now, and
this isn't fixing any bugs. I'll push it after the release.


On Thu, 23 Mar 2023, 11:07 Ken Matsui via Libstdc++, <libstdc++@gcc.gnu.org>
wrote:

> In the type_traits header, both integral_constant<bool> and __bool_constant
> are used. This patch unifies those usages into __bool_constant.
>
> libstdc++-v3/ChangeLog:
>
>         * include/std/type_traits: Use __bool_constant instead of
>         integral_constant.
>
> Signed-off-by: Ken Matsui <kmatsui@cs.washington.edu>
> ---
>  libstdc++-v3/include/std/type_traits | 32 ++++++++++++++--------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/libstdc++-v3/include/std/type_traits
> b/libstdc++-v3/include/std/type_traits
> index 2bd607a8b8f..bc6982f9e64 100644
> --- a/libstdc++-v3/include/std/type_traits
> +++ b/libstdc++-v3/include/std/type_traits
> @@ -578,19 +578,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// is_enum
>    template<typename _Tp>
>      struct is_enum
> -    : public integral_constant<bool, __is_enum(_Tp)>
> +    : public __bool_constant<__is_enum(_Tp)>
>      { };
>
>    /// is_union
>    template<typename _Tp>
>      struct is_union
> -    : public integral_constant<bool, __is_union(_Tp)>
> +    : public __bool_constant<__is_union(_Tp)>
>      { };
>
>    /// is_class
>    template<typename _Tp>
>      struct is_class
> -    : public integral_constant<bool, __is_class(_Tp)>
> +    : public __bool_constant<__is_class(_Tp)>
>      { };
>
>    /// is_function
> @@ -784,7 +784,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// is_trivial
>    template<typename _Tp>
>      struct is_trivial
> -    : public integral_constant<bool, __is_trivial(_Tp)>
> +    : public __bool_constant<__is_trivial(_Tp)>
>      {
>
>  static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>         "template argument must be a complete class or an unbounded
> array");
> @@ -793,7 +793,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// is_trivially_copyable
>    template<typename _Tp>
>      struct is_trivially_copyable
> -    : public integral_constant<bool, __is_trivially_copyable(_Tp)>
> +    : public __bool_constant<__is_trivially_copyable(_Tp)>
>      {
>
>  static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>         "template argument must be a complete class or an unbounded
> array");
> @@ -802,7 +802,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// is_standard_layout
>    template<typename _Tp>
>      struct is_standard_layout
> -    : public integral_constant<bool, __is_standard_layout(_Tp)>
> +    : public __bool_constant<__is_standard_layout(_Tp)>
>      {
>
>  static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>         "template argument must be a complete class or an unbounded
> array");
> @@ -817,7 +817,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>      struct
>      _GLIBCXX20_DEPRECATED_SUGGEST("is_standard_layout && is_trivial")
>      is_pod
> -    : public integral_constant<bool, __is_pod(_Tp)>
> +    : public __bool_constant<__is_pod(_Tp)>
>      {
>
>  static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>         "template argument must be a complete class or an unbounded
> array");
> @@ -831,7 +831,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>      struct
>      _GLIBCXX17_DEPRECATED
>      is_literal_type
> -    : public integral_constant<bool, __is_literal_type(_Tp)>
> +    : public __bool_constant<__is_literal_type(_Tp)>
>      {
>
>  static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>         "template argument must be a complete class or an unbounded
> array");
> @@ -840,13 +840,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// is_empty
>    template<typename _Tp>
>      struct is_empty
> -    : public integral_constant<bool, __is_empty(_Tp)>
> +    : public __bool_constant<__is_empty(_Tp)>
>      { };
>
>    /// is_polymorphic
>    template<typename _Tp>
>      struct is_polymorphic
> -    : public integral_constant<bool, __is_polymorphic(_Tp)>
> +    : public __bool_constant<__is_polymorphic(_Tp)>
>      { };
>
>  #if __cplusplus >= 201402L
> @@ -855,14 +855,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// @since C++14
>    template<typename _Tp>
>      struct is_final
> -    : public integral_constant<bool, __is_final(_Tp)>
> +    : public __bool_constant<__is_final(_Tp)>
>      { };
>  #endif
>
>    /// is_abstract
>    template<typename _Tp>
>      struct is_abstract
> -    : public integral_constant<bool, __is_abstract(_Tp)>
> +    : public __bool_constant<__is_abstract(_Tp)>
>      { };
>
>    /// @cond undocumented
> @@ -873,7 +873,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>
>    template<typename _Tp>
>      struct __is_signed_helper<_Tp, true>
> -    : public integral_constant<bool, _Tp(-1) < _Tp(0)>
> +    : public __bool_constant<_Tp(-1) < _Tp(0)>
>      { };
>    /// @endcond
>
> @@ -1333,7 +1333,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// has_virtual_destructor
>    template<typename _Tp>
>      struct has_virtual_destructor
> -    : public integral_constant<bool, __has_virtual_destructor(_Tp)>
> +    : public __bool_constant<__has_virtual_destructor(_Tp)>
>      {
>
>  static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>         "template argument must be a complete class or an unbounded
> array");
> @@ -1392,7 +1392,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    template<typename _Tp, typename _Up>
>      struct is_same
>  #ifdef _GLIBCXX_HAVE_BUILTIN_IS_SAME
> -    : public integral_constant<bool, __is_same(_Tp, _Up)>
> +    : public __bool_constant<__is_same(_Tp, _Up)>
>  #else
>      : public false_type
>  #endif
> @@ -1408,7 +1408,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>    /// is_base_of
>    template<typename _Base, typename _Derived>
>      struct is_base_of
> -    : public integral_constant<bool, __is_base_of(_Base, _Derived)>
> +    : public __bool_constant<__is_base_of(_Base, _Derived)>
>      { };
>
>  #if __has_builtin(__is_convertible)
> --
> 2.40.0
>
>

Ken Matsui April 8, 2023, 9:08 p.m. UTC | #3

I see. Thank you!

On Sat, Apr 8, 2023 at 12:52 AM Jonathan Wakely <jwakely.gcc@gmail.com> wrote:
>
> This looks good, thanks, but we're too close to the gcc 13 release now, and this isn't fixing any bugs. I'll push it after the release.
>
>
> On Thu, 23 Mar 2023, 11:07 Ken Matsui via Libstdc++, <libstdc++@gcc.gnu.org> wrote:
>>
>> In the type_traits header, both integral_constant<bool> and __bool_constant
>> are used. This patch unifies those usages into __bool_constant.
>>
>> libstdc++-v3/ChangeLog:
>>
>>         * include/std/type_traits: Use __bool_constant instead of
>>         integral_constant.
>>
>> Signed-off-by: Ken Matsui <kmatsui@cs.washington.edu>
>> ---
>>  libstdc++-v3/include/std/type_traits | 32 ++++++++++++++--------------
>>  1 file changed, 16 insertions(+), 16 deletions(-)
>>
>> diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
>> index 2bd607a8b8f..bc6982f9e64 100644
>> --- a/libstdc++-v3/include/std/type_traits
>> +++ b/libstdc++-v3/include/std/type_traits
>> @@ -578,19 +578,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>>    /// is_enum
>>    template<typename _Tp>
>>      struct is_enum
>> -    : public integral_constant<bool, __is_enum(_Tp)>
>> +    : public __bool_constant<__is_enum(_Tp)>
>>      { };
>>
>>    /// is_union
>>    template<typename _Tp>
>>      struct is_union
>> -    : public integral_constant<bool, __is_union(_Tp)>
>> +    : public __bool_constant<__is_union(_Tp)>
>>      { };
>>
>>    /// is_class
>>    template<typename _Tp>
>>      struct is_class
>> -    : public integral_constant<bool, __is_class(_Tp)>
>> +    : public __bool_constant<__is_class(_Tp)>
>>      { };
>>
>>    /// is_function
>> @@ -784,7 +784,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>>    /// is_trivial
>>    template<typename _Tp>
>>      struct is_trivial
>> -    : public integral_constant<bool, __is_trivial(_Tp)>
>> +    : public __bool_constant<__is_trivial(_Tp)>
>>      {
>>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>>         "template argument must be a complete class or an unbounded array");
>> @@ -793,7 +793,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>>    /// is_trivially_copyable
>>    template<typename _Tp>
>>      struct is_trivially_copyable
>> -    : public integral_constant<bool, __is_trivially_copyable(_Tp)>
>> +    : public __bool_constant<__is_trivially_copyable(_Tp)>
>>      {
>>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>>         "template argument must be a complete class or an unbounded array");
>> @@ -802,7 +802,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>>    /// is_standard_layout
>>    template<typename _Tp>
>>      struct is_standard_layout
>> -    : public integral_constant<bool, __is_standard_layout(_Tp)>
>> +    : public __bool_constant<__is_standard_layout(_Tp)>
>>      {
>>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>>         "template argument must be a complete class or an unbounded array");
>> @@ -817,7 +817,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>>      struct
>>      _GLIBCXX20_DEPRECATED_SUGGEST("is_standard_layout && is_trivial")
>>      is_pod
>> -    : public integral_constant<bool, __is_pod(_Tp)>
>> +    : public __bool_constant<__is_pod(_Tp)>
>>      {
>>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>>         "template argument must be a complete class or an unbounded array");
>> @@ -831,7 +831,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>>      struct
>>      _GLIBCXX17_DEPRECATED
>>      is_literal_type
>> -    : public integral_constant<bool, __is_literal_type(_Tp)>
>> +    : public __bool_constant<__is_literal_type(_Tp)>
>>      {
>>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>>         "template argument must be a complete class or an unbounded array");
>> @@ -840,13 +840,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>>    /// is_empty
>>    template<typename _Tp>
>>      struct is_empty
>> -    : public integral_constant<bool, __is_empty(_Tp)>
>> +    : public __bool_constant<__is_empty(_Tp)>
>>      { };
>>
>>    /// is_polymorphic
>>    template<typename _Tp>
>>      struct is_polymorphic
>> -    : public integral_constant<bool, __is_polymorphic(_Tp)>
>> +    : public __bool_constant<__is_polymorphic(_Tp)>
>>      { };
>>
>>  #if __cplusplus >= 201402L
>> @@ -855,14 +855,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>>    /// @since C++14
>>    template<typename _Tp>
>>      struct is_final
>> -    : public integral_constant<bool, __is_final(_Tp)>
>> +    : public __bool_constant<__is_final(_Tp)>
>>      { };
>>  #endif
>>
>>    /// is_abstract
>>    template<typename _Tp>
>>      struct is_abstract
>> -    : public integral_constant<bool, __is_abstract(_Tp)>
>> +    : public __bool_constant<__is_abstract(_Tp)>
>>      { };
>>
>>    /// @cond undocumented
>> @@ -873,7 +873,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>>
>>    template<typename _Tp>
>>      struct __is_signed_helper<_Tp, true>
>> -    : public integral_constant<bool, _Tp(-1) < _Tp(0)>
>> +    : public __bool_constant<_Tp(-1) < _Tp(0)>
>>      { };
>>    /// @endcond
>>
>> @@ -1333,7 +1333,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>>    /// has_virtual_destructor
>>    template<typename _Tp>
>>      struct has_virtual_destructor
>> -    : public integral_constant<bool, __has_virtual_destructor(_Tp)>
>> +    : public __bool_constant<__has_virtual_destructor(_Tp)>
>>      {
>>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
>>         "template argument must be a complete class or an unbounded array");
>> @@ -1392,7 +1392,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>>    template<typename _Tp, typename _Up>
>>      struct is_same
>>  #ifdef _GLIBCXX_HAVE_BUILTIN_IS_SAME
>> -    : public integral_constant<bool, __is_same(_Tp, _Up)>
>> +    : public __bool_constant<__is_same(_Tp, _Up)>
>>  #else
>>      : public false_type
>>  #endif
>> @@ -1408,7 +1408,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>>    /// is_base_of
>>    template<typename _Base, typename _Derived>
>>      struct is_base_of
>> -    : public integral_constant<bool, __is_base_of(_Base, _Derived)>
>> +    : public __bool_constant<__is_base_of(_Base, _Derived)>
>>      { };
>>
>>  #if __has_builtin(__is_convertible)
>> --
>> 2.40.0
>>

Ken Matsui May 13, 2023, 3:22 a.m. UTC | #4

It appears that GCC 13 has been released, but I am wondering if there
are any issues preventing this patch from being merged yet. Can you
provide any information on this?

On Sat, Apr 8, 2023 at 2:08 PM Ken Matsui <kmatsui@cs.washington.edu> wrote:
>
> I see. Thank you!
>
> On Sat, Apr 8, 2023 at 12:52 AM Jonathan Wakely <jwakely.gcc@gmail.com> wrote:
> >
> > This looks good, thanks, but we're too close to the gcc 13 release now, and this isn't fixing any bugs. I'll push it after the release.
> >
> >
> > On Thu, 23 Mar 2023, 11:07 Ken Matsui via Libstdc++, <libstdc++@gcc.gnu.org> wrote:
> >>
> >> In the type_traits header, both integral_constant<bool> and __bool_constant
> >> are used. This patch unifies those usages into __bool_constant.
> >>
> >> libstdc++-v3/ChangeLog:
> >>
> >>         * include/std/type_traits: Use __bool_constant instead of
> >>         integral_constant.
> >>
> >> Signed-off-by: Ken Matsui <kmatsui@cs.washington.edu>
> >> ---
> >>  libstdc++-v3/include/std/type_traits | 32 ++++++++++++++--------------
> >>  1 file changed, 16 insertions(+), 16 deletions(-)
> >>
> >> diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
> >> index 2bd607a8b8f..bc6982f9e64 100644
> >> --- a/libstdc++-v3/include/std/type_traits
> >> +++ b/libstdc++-v3/include/std/type_traits
> >> @@ -578,19 +578,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >>    /// is_enum
> >>    template<typename _Tp>
> >>      struct is_enum
> >> -    : public integral_constant<bool, __is_enum(_Tp)>
> >> +    : public __bool_constant<__is_enum(_Tp)>
> >>      { };
> >>
> >>    /// is_union
> >>    template<typename _Tp>
> >>      struct is_union
> >> -    : public integral_constant<bool, __is_union(_Tp)>
> >> +    : public __bool_constant<__is_union(_Tp)>
> >>      { };
> >>
> >>    /// is_class
> >>    template<typename _Tp>
> >>      struct is_class
> >> -    : public integral_constant<bool, __is_class(_Tp)>
> >> +    : public __bool_constant<__is_class(_Tp)>
> >>      { };
> >>
> >>    /// is_function
> >> @@ -784,7 +784,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >>    /// is_trivial
> >>    template<typename _Tp>
> >>      struct is_trivial
> >> -    : public integral_constant<bool, __is_trivial(_Tp)>
> >> +    : public __bool_constant<__is_trivial(_Tp)>
> >>      {
> >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> >>         "template argument must be a complete class or an unbounded array");
> >> @@ -793,7 +793,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >>    /// is_trivially_copyable
> >>    template<typename _Tp>
> >>      struct is_trivially_copyable
> >> -    : public integral_constant<bool, __is_trivially_copyable(_Tp)>
> >> +    : public __bool_constant<__is_trivially_copyable(_Tp)>
> >>      {
> >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> >>         "template argument must be a complete class or an unbounded array");
> >> @@ -802,7 +802,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >>    /// is_standard_layout
> >>    template<typename _Tp>
> >>      struct is_standard_layout
> >> -    : public integral_constant<bool, __is_standard_layout(_Tp)>
> >> +    : public __bool_constant<__is_standard_layout(_Tp)>
> >>      {
> >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> >>         "template argument must be a complete class or an unbounded array");
> >> @@ -817,7 +817,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >>      struct
> >>      _GLIBCXX20_DEPRECATED_SUGGEST("is_standard_layout && is_trivial")
> >>      is_pod
> >> -    : public integral_constant<bool, __is_pod(_Tp)>
> >> +    : public __bool_constant<__is_pod(_Tp)>
> >>      {
> >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> >>         "template argument must be a complete class or an unbounded array");
> >> @@ -831,7 +831,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >>      struct
> >>      _GLIBCXX17_DEPRECATED
> >>      is_literal_type
> >> -    : public integral_constant<bool, __is_literal_type(_Tp)>
> >> +    : public __bool_constant<__is_literal_type(_Tp)>
> >>      {
> >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> >>         "template argument must be a complete class or an unbounded array");
> >> @@ -840,13 +840,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >>    /// is_empty
> >>    template<typename _Tp>
> >>      struct is_empty
> >> -    : public integral_constant<bool, __is_empty(_Tp)>
> >> +    : public __bool_constant<__is_empty(_Tp)>
> >>      { };
> >>
> >>    /// is_polymorphic
> >>    template<typename _Tp>
> >>      struct is_polymorphic
> >> -    : public integral_constant<bool, __is_polymorphic(_Tp)>
> >> +    : public __bool_constant<__is_polymorphic(_Tp)>
> >>      { };
> >>
> >>  #if __cplusplus >= 201402L
> >> @@ -855,14 +855,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >>    /// @since C++14
> >>    template<typename _Tp>
> >>      struct is_final
> >> -    : public integral_constant<bool, __is_final(_Tp)>
> >> +    : public __bool_constant<__is_final(_Tp)>
> >>      { };
> >>  #endif
> >>
> >>    /// is_abstract
> >>    template<typename _Tp>
> >>      struct is_abstract
> >> -    : public integral_constant<bool, __is_abstract(_Tp)>
> >> +    : public __bool_constant<__is_abstract(_Tp)>
> >>      { };
> >>
> >>    /// @cond undocumented
> >> @@ -873,7 +873,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >>
> >>    template<typename _Tp>
> >>      struct __is_signed_helper<_Tp, true>
> >> -    : public integral_constant<bool, _Tp(-1) < _Tp(0)>
> >> +    : public __bool_constant<_Tp(-1) < _Tp(0)>
> >>      { };
> >>    /// @endcond
> >>
> >> @@ -1333,7 +1333,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >>    /// has_virtual_destructor
> >>    template<typename _Tp>
> >>      struct has_virtual_destructor
> >> -    : public integral_constant<bool, __has_virtual_destructor(_Tp)>
> >> +    : public __bool_constant<__has_virtual_destructor(_Tp)>
> >>      {
> >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> >>         "template argument must be a complete class or an unbounded array");
> >> @@ -1392,7 +1392,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >>    template<typename _Tp, typename _Up>
> >>      struct is_same
> >>  #ifdef _GLIBCXX_HAVE_BUILTIN_IS_SAME
> >> -    : public integral_constant<bool, __is_same(_Tp, _Up)>
> >> +    : public __bool_constant<__is_same(_Tp, _Up)>
> >>  #else
> >>      : public false_type
> >>  #endif
> >> @@ -1408,7 +1408,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >>    /// is_base_of
> >>    template<typename _Base, typename _Derived>
> >>      struct is_base_of
> >> -    : public integral_constant<bool, __is_base_of(_Base, _Derived)>
> >> +    : public __bool_constant<__is_base_of(_Base, _Derived)>
> >>      { };
> >>
> >>  #if __has_builtin(__is_convertible)
> >> --
> >> 2.40.0
> >>

Patrick Palka May 17, 2023, 3:53 p.m. UTC | #5

On Fri, 12 May 2023, Ken Matsui via Libstdc++ wrote:

> It appears that GCC 13 has been released, but I am wondering if there
> are any issues preventing this patch from being merged yet. Can you
> provide any information on this?

Thanks for the reminder, I pushed this to trunk just now
(r14-940-g637edefc5863cf). Congrats on your first libstdc++ commit!

> 
> On Sat, Apr 8, 2023 at 2:08 PM Ken Matsui <kmatsui@cs.washington.edu> wrote:
> >
> > I see. Thank you!
> >
> > On Sat, Apr 8, 2023 at 12:52 AM Jonathan Wakely <jwakely.gcc@gmail.com> wrote:
> > >
> > > This looks good, thanks, but we're too close to the gcc 13 release now, and this isn't fixing any bugs. I'll push it after the release.
> > >
> > >
> > > On Thu, 23 Mar 2023, 11:07 Ken Matsui via Libstdc++, <libstdc++@gcc.gnu.org> wrote:
> > >>
> > >> In the type_traits header, both integral_constant<bool> and __bool_constant
> > >> are used. This patch unifies those usages into __bool_constant.
> > >>
> > >> libstdc++-v3/ChangeLog:
> > >>
> > >>         * include/std/type_traits: Use __bool_constant instead of
> > >>         integral_constant.
> > >>
> > >> Signed-off-by: Ken Matsui <kmatsui@cs.washington.edu>
> > >> ---
> > >>  libstdc++-v3/include/std/type_traits | 32 ++++++++++++++--------------
> > >>  1 file changed, 16 insertions(+), 16 deletions(-)
> > >>
> > >> diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
> > >> index 2bd607a8b8f..bc6982f9e64 100644
> > >> --- a/libstdc++-v3/include/std/type_traits
> > >> +++ b/libstdc++-v3/include/std/type_traits
> > >> @@ -578,19 +578,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > >>    /// is_enum
> > >>    template<typename _Tp>
> > >>      struct is_enum
> > >> -    : public integral_constant<bool, __is_enum(_Tp)>
> > >> +    : public __bool_constant<__is_enum(_Tp)>
> > >>      { };
> > >>
> > >>    /// is_union
> > >>    template<typename _Tp>
> > >>      struct is_union
> > >> -    : public integral_constant<bool, __is_union(_Tp)>
> > >> +    : public __bool_constant<__is_union(_Tp)>
> > >>      { };
> > >>
> > >>    /// is_class
> > >>    template<typename _Tp>
> > >>      struct is_class
> > >> -    : public integral_constant<bool, __is_class(_Tp)>
> > >> +    : public __bool_constant<__is_class(_Tp)>
> > >>      { };
> > >>
> > >>    /// is_function
> > >> @@ -784,7 +784,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > >>    /// is_trivial
> > >>    template<typename _Tp>
> > >>      struct is_trivial
> > >> -    : public integral_constant<bool, __is_trivial(_Tp)>
> > >> +    : public __bool_constant<__is_trivial(_Tp)>
> > >>      {
> > >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> > >>         "template argument must be a complete class or an unbounded array");
> > >> @@ -793,7 +793,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > >>    /// is_trivially_copyable
> > >>    template<typename _Tp>
> > >>      struct is_trivially_copyable
> > >> -    : public integral_constant<bool, __is_trivially_copyable(_Tp)>
> > >> +    : public __bool_constant<__is_trivially_copyable(_Tp)>
> > >>      {
> > >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> > >>         "template argument must be a complete class or an unbounded array");
> > >> @@ -802,7 +802,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > >>    /// is_standard_layout
> > >>    template<typename _Tp>
> > >>      struct is_standard_layout
> > >> -    : public integral_constant<bool, __is_standard_layout(_Tp)>
> > >> +    : public __bool_constant<__is_standard_layout(_Tp)>
> > >>      {
> > >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> > >>         "template argument must be a complete class or an unbounded array");
> > >> @@ -817,7 +817,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > >>      struct
> > >>      _GLIBCXX20_DEPRECATED_SUGGEST("is_standard_layout && is_trivial")
> > >>      is_pod
> > >> -    : public integral_constant<bool, __is_pod(_Tp)>
> > >> +    : public __bool_constant<__is_pod(_Tp)>
> > >>      {
> > >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> > >>         "template argument must be a complete class or an unbounded array");
> > >> @@ -831,7 +831,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > >>      struct
> > >>      _GLIBCXX17_DEPRECATED
> > >>      is_literal_type
> > >> -    : public integral_constant<bool, __is_literal_type(_Tp)>
> > >> +    : public __bool_constant<__is_literal_type(_Tp)>
> > >>      {
> > >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> > >>         "template argument must be a complete class or an unbounded array");
> > >> @@ -840,13 +840,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > >>    /// is_empty
> > >>    template<typename _Tp>
> > >>      struct is_empty
> > >> -    : public integral_constant<bool, __is_empty(_Tp)>
> > >> +    : public __bool_constant<__is_empty(_Tp)>
> > >>      { };
> > >>
> > >>    /// is_polymorphic
> > >>    template<typename _Tp>
> > >>      struct is_polymorphic
> > >> -    : public integral_constant<bool, __is_polymorphic(_Tp)>
> > >> +    : public __bool_constant<__is_polymorphic(_Tp)>
> > >>      { };
> > >>
> > >>  #if __cplusplus >= 201402L
> > >> @@ -855,14 +855,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > >>    /// @since C++14
> > >>    template<typename _Tp>
> > >>      struct is_final
> > >> -    : public integral_constant<bool, __is_final(_Tp)>
> > >> +    : public __bool_constant<__is_final(_Tp)>
> > >>      { };
> > >>  #endif
> > >>
> > >>    /// is_abstract
> > >>    template<typename _Tp>
> > >>      struct is_abstract
> > >> -    : public integral_constant<bool, __is_abstract(_Tp)>
> > >> +    : public __bool_constant<__is_abstract(_Tp)>
> > >>      { };
> > >>
> > >>    /// @cond undocumented
> > >> @@ -873,7 +873,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > >>
> > >>    template<typename _Tp>
> > >>      struct __is_signed_helper<_Tp, true>
> > >> -    : public integral_constant<bool, _Tp(-1) < _Tp(0)>
> > >> +    : public __bool_constant<_Tp(-1) < _Tp(0)>
> > >>      { };
> > >>    /// @endcond
> > >>
> > >> @@ -1333,7 +1333,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > >>    /// has_virtual_destructor
> > >>    template<typename _Tp>
> > >>      struct has_virtual_destructor
> > >> -    : public integral_constant<bool, __has_virtual_destructor(_Tp)>
> > >> +    : public __bool_constant<__has_virtual_destructor(_Tp)>
> > >>      {
> > >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> > >>         "template argument must be a complete class or an unbounded array");
> > >> @@ -1392,7 +1392,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > >>    template<typename _Tp, typename _Up>
> > >>      struct is_same
> > >>  #ifdef _GLIBCXX_HAVE_BUILTIN_IS_SAME
> > >> -    : public integral_constant<bool, __is_same(_Tp, _Up)>
> > >> +    : public __bool_constant<__is_same(_Tp, _Up)>
> > >>  #else
> > >>      : public false_type
> > >>  #endif
> > >> @@ -1408,7 +1408,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > >>    /// is_base_of
> > >>    template<typename _Base, typename _Derived>
> > >>      struct is_base_of
> > >> -    : public integral_constant<bool, __is_base_of(_Base, _Derived)>
> > >> +    : public __bool_constant<__is_base_of(_Base, _Derived)>
> > >>      { };
> > >>
> > >>  #if __has_builtin(__is_convertible)
> > >> --
> > >> 2.40.0
> > >>
> 
>

Ken Matsui May 17, 2023, 9:14 p.m. UTC | #6

Thank you!

On Wed, May 17, 2023 at 8:53 AM Patrick Palka <ppalka@redhat.com> wrote:
>
> On Fri, 12 May 2023, Ken Matsui via Libstdc++ wrote:
>
> > It appears that GCC 13 has been released, but I am wondering if there
> > are any issues preventing this patch from being merged yet. Can you
> > provide any information on this?
>
> Thanks for the reminder, I pushed this to trunk just now
> (r14-940-g637edefc5863cf). Congrats on your first libstdc++ commit!
>
> >
> > On Sat, Apr 8, 2023 at 2:08 PM Ken Matsui <kmatsui@cs.washington.edu> wrote:
> > >
> > > I see. Thank you!
> > >
> > > On Sat, Apr 8, 2023 at 12:52 AM Jonathan Wakely <jwakely.gcc@gmail.com> wrote:
> > > >
> > > > This looks good, thanks, but we're too close to the gcc 13 release now, and this isn't fixing any bugs. I'll push it after the release.
> > > >
> > > >
> > > > On Thu, 23 Mar 2023, 11:07 Ken Matsui via Libstdc++, <libstdc++@gcc.gnu.org> wrote:
> > > >>
> > > >> In the type_traits header, both integral_constant<bool> and __bool_constant
> > > >> are used. This patch unifies those usages into __bool_constant.
> > > >>
> > > >> libstdc++-v3/ChangeLog:
> > > >>
> > > >>         * include/std/type_traits: Use __bool_constant instead of
> > > >>         integral_constant.
> > > >>
> > > >> Signed-off-by: Ken Matsui <kmatsui@cs.washington.edu>
> > > >> ---
> > > >>  libstdc++-v3/include/std/type_traits | 32 ++++++++++++++--------------
> > > >>  1 file changed, 16 insertions(+), 16 deletions(-)
> > > >>
> > > >> diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
> > > >> index 2bd607a8b8f..bc6982f9e64 100644
> > > >> --- a/libstdc++-v3/include/std/type_traits
> > > >> +++ b/libstdc++-v3/include/std/type_traits
> > > >> @@ -578,19 +578,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > >>    /// is_enum
> > > >>    template<typename _Tp>
> > > >>      struct is_enum
> > > >> -    : public integral_constant<bool, __is_enum(_Tp)>
> > > >> +    : public __bool_constant<__is_enum(_Tp)>
> > > >>      { };
> > > >>
> > > >>    /// is_union
> > > >>    template<typename _Tp>
> > > >>      struct is_union
> > > >> -    : public integral_constant<bool, __is_union(_Tp)>
> > > >> +    : public __bool_constant<__is_union(_Tp)>
> > > >>      { };
> > > >>
> > > >>    /// is_class
> > > >>    template<typename _Tp>
> > > >>      struct is_class
> > > >> -    : public integral_constant<bool, __is_class(_Tp)>
> > > >> +    : public __bool_constant<__is_class(_Tp)>
> > > >>      { };
> > > >>
> > > >>    /// is_function
> > > >> @@ -784,7 +784,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > >>    /// is_trivial
> > > >>    template<typename _Tp>
> > > >>      struct is_trivial
> > > >> -    : public integral_constant<bool, __is_trivial(_Tp)>
> > > >> +    : public __bool_constant<__is_trivial(_Tp)>
> > > >>      {
> > > >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> > > >>         "template argument must be a complete class or an unbounded array");
> > > >> @@ -793,7 +793,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > >>    /// is_trivially_copyable
> > > >>    template<typename _Tp>
> > > >>      struct is_trivially_copyable
> > > >> -    : public integral_constant<bool, __is_trivially_copyable(_Tp)>
> > > >> +    : public __bool_constant<__is_trivially_copyable(_Tp)>
> > > >>      {
> > > >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> > > >>         "template argument must be a complete class or an unbounded array");
> > > >> @@ -802,7 +802,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > >>    /// is_standard_layout
> > > >>    template<typename _Tp>
> > > >>      struct is_standard_layout
> > > >> -    : public integral_constant<bool, __is_standard_layout(_Tp)>
> > > >> +    : public __bool_constant<__is_standard_layout(_Tp)>
> > > >>      {
> > > >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> > > >>         "template argument must be a complete class or an unbounded array");
> > > >> @@ -817,7 +817,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > >>      struct
> > > >>      _GLIBCXX20_DEPRECATED_SUGGEST("is_standard_layout && is_trivial")
> > > >>      is_pod
> > > >> -    : public integral_constant<bool, __is_pod(_Tp)>
> > > >> +    : public __bool_constant<__is_pod(_Tp)>
> > > >>      {
> > > >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> > > >>         "template argument must be a complete class or an unbounded array");
> > > >> @@ -831,7 +831,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > >>      struct
> > > >>      _GLIBCXX17_DEPRECATED
> > > >>      is_literal_type
> > > >> -    : public integral_constant<bool, __is_literal_type(_Tp)>
> > > >> +    : public __bool_constant<__is_literal_type(_Tp)>
> > > >>      {
> > > >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> > > >>         "template argument must be a complete class or an unbounded array");
> > > >> @@ -840,13 +840,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > >>    /// is_empty
> > > >>    template<typename _Tp>
> > > >>      struct is_empty
> > > >> -    : public integral_constant<bool, __is_empty(_Tp)>
> > > >> +    : public __bool_constant<__is_empty(_Tp)>
> > > >>      { };
> > > >>
> > > >>    /// is_polymorphic
> > > >>    template<typename _Tp>
> > > >>      struct is_polymorphic
> > > >> -    : public integral_constant<bool, __is_polymorphic(_Tp)>
> > > >> +    : public __bool_constant<__is_polymorphic(_Tp)>
> > > >>      { };
> > > >>
> > > >>  #if __cplusplus >= 201402L
> > > >> @@ -855,14 +855,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > >>    /// @since C++14
> > > >>    template<typename _Tp>
> > > >>      struct is_final
> > > >> -    : public integral_constant<bool, __is_final(_Tp)>
> > > >> +    : public __bool_constant<__is_final(_Tp)>
> > > >>      { };
> > > >>  #endif
> > > >>
> > > >>    /// is_abstract
> > > >>    template<typename _Tp>
> > > >>      struct is_abstract
> > > >> -    : public integral_constant<bool, __is_abstract(_Tp)>
> > > >> +    : public __bool_constant<__is_abstract(_Tp)>
> > > >>      { };
> > > >>
> > > >>    /// @cond undocumented
> > > >> @@ -873,7 +873,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > >>
> > > >>    template<typename _Tp>
> > > >>      struct __is_signed_helper<_Tp, true>
> > > >> -    : public integral_constant<bool, _Tp(-1) < _Tp(0)>
> > > >> +    : public __bool_constant<_Tp(-1) < _Tp(0)>
> > > >>      { };
> > > >>    /// @endcond
> > > >>
> > > >> @@ -1333,7 +1333,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > >>    /// has_virtual_destructor
> > > >>    template<typename _Tp>
> > > >>      struct has_virtual_destructor
> > > >> -    : public integral_constant<bool, __has_virtual_destructor(_Tp)>
> > > >> +    : public __bool_constant<__has_virtual_destructor(_Tp)>
> > > >>      {
> > > >>        static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
> > > >>         "template argument must be a complete class or an unbounded array");
> > > >> @@ -1392,7 +1392,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > >>    template<typename _Tp, typename _Up>
> > > >>      struct is_same
> > > >>  #ifdef _GLIBCXX_HAVE_BUILTIN_IS_SAME
> > > >> -    : public integral_constant<bool, __is_same(_Tp, _Up)>
> > > >> +    : public __bool_constant<__is_same(_Tp, _Up)>
> > > >>  #else
> > > >>      : public false_type
> > > >>  #endif
> > > >> @@ -1408,7 +1408,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > >>    /// is_base_of
> > > >>    template<typename _Base, typename _Derived>
> > > >>      struct is_base_of
> > > >> -    : public integral_constant<bool, __is_base_of(_Base, _Derived)>
> > > >> +    : public __bool_constant<__is_base_of(_Base, _Derived)>
> > > >>      { };
> > > >>
> > > >>  #if __has_builtin(__is_convertible)
> > > >> --
> > > >> 2.40.0
> > > >>
> >
> >

diff mbox series

Patch

diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 2bd607a8b8f..bc6982f9e64 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -578,19 +578,19 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
   /// is_enum
   template<typename _Tp>
     struct is_enum
-    : public integral_constant<bool, __is_enum(_Tp)>
+    : public __bool_constant<__is_enum(_Tp)>
     { };
 
   /// is_union
   template<typename _Tp>
     struct is_union
-    : public integral_constant<bool, __is_union(_Tp)>
+    : public __bool_constant<__is_union(_Tp)>
     { };
 
   /// is_class
   template<typename _Tp>
     struct is_class
-    : public integral_constant<bool, __is_class(_Tp)>
+    : public __bool_constant<__is_class(_Tp)>
     { };
 
   /// is_function
@@ -784,7 +784,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
   /// is_trivial
   template<typename _Tp>
     struct is_trivial
-    : public integral_constant<bool, __is_trivial(_Tp)>
+    : public __bool_constant<__is_trivial(_Tp)>
     {
       static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
 	"template argument must be a complete class or an unbounded array");
@@ -793,7 +793,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
   /// is_trivially_copyable
   template<typename _Tp>
     struct is_trivially_copyable
-    : public integral_constant<bool, __is_trivially_copyable(_Tp)>
+    : public __bool_constant<__is_trivially_copyable(_Tp)>
     {
       static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
 	"template argument must be a complete class or an unbounded array");
@@ -802,7 +802,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
   /// is_standard_layout
   template<typename _Tp>
     struct is_standard_layout
-    : public integral_constant<bool, __is_standard_layout(_Tp)>
+    : public __bool_constant<__is_standard_layout(_Tp)>
     {
       static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
 	"template argument must be a complete class or an unbounded array");
@@ -817,7 +817,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
     struct
     _GLIBCXX20_DEPRECATED_SUGGEST("is_standard_layout && is_trivial")
     is_pod
-    : public integral_constant<bool, __is_pod(_Tp)>
+    : public __bool_constant<__is_pod(_Tp)>
     {
       static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
 	"template argument must be a complete class or an unbounded array");
@@ -831,7 +831,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
     struct
     _GLIBCXX17_DEPRECATED
     is_literal_type
-    : public integral_constant<bool, __is_literal_type(_Tp)>
+    : public __bool_constant<__is_literal_type(_Tp)>
     {
       static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
 	"template argument must be a complete class or an unbounded array");
@@ -840,13 +840,13 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
   /// is_empty
   template<typename _Tp>
     struct is_empty
-    : public integral_constant<bool, __is_empty(_Tp)>
+    : public __bool_constant<__is_empty(_Tp)>
     { };
 
   /// is_polymorphic
   template<typename _Tp>
     struct is_polymorphic
-    : public integral_constant<bool, __is_polymorphic(_Tp)>
+    : public __bool_constant<__is_polymorphic(_Tp)>
     { };
 
 #if __cplusplus >= 201402L
@@ -855,14 +855,14 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
   /// @since C++14
   template<typename _Tp>
     struct is_final
-    : public integral_constant<bool, __is_final(_Tp)>
+    : public __bool_constant<__is_final(_Tp)>
     { };
 #endif
 
   /// is_abstract
   template<typename _Tp>
     struct is_abstract
-    : public integral_constant<bool, __is_abstract(_Tp)>
+    : public __bool_constant<__is_abstract(_Tp)>
     { };
 
   /// @cond undocumented
@@ -873,7 +873,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   template<typename _Tp>
     struct __is_signed_helper<_Tp, true>
-    : public integral_constant<bool, _Tp(-1) < _Tp(0)>
+    : public __bool_constant<_Tp(-1) < _Tp(0)>
     { };
   /// @endcond
 
@@ -1333,7 +1333,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
   /// has_virtual_destructor
   template<typename _Tp>
     struct has_virtual_destructor
-    : public integral_constant<bool, __has_virtual_destructor(_Tp)>
+    : public __bool_constant<__has_virtual_destructor(_Tp)>
     {
       static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
 	"template argument must be a complete class or an unbounded array");
@@ -1392,7 +1392,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
   template<typename _Tp, typename _Up>
     struct is_same
 #ifdef _GLIBCXX_HAVE_BUILTIN_IS_SAME
-    : public integral_constant<bool, __is_same(_Tp, _Up)>
+    : public __bool_constant<__is_same(_Tp, _Up)>
 #else
     : public false_type
 #endif
@@ -1408,7 +1408,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
   /// is_base_of
   template<typename _Base, typename _Derived>
     struct is_base_of
-    : public integral_constant<bool, __is_base_of(_Base, _Derived)>
+    : public __bool_constant<__is_base_of(_Base, _Derived)>
     { };
 
 #if __has_builtin(__is_convertible)