From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vk1-xa2f.google.com (mail-vk1-xa2f.google.com [IPv6:2607:f8b0:4864:20::a2f]) by sourceware.org (Postfix) with ESMTPS id 24AA13858428 for ; Mon, 4 Sep 2023 15:00:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 24AA13858428 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=cs.washington.edu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=cs.washington.edu Received: by mail-vk1-xa2f.google.com with SMTP id 71dfb90a1353d-48d109dc6beso319114e0c.1 for ; Mon, 04 Sep 2023 08:00:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; t=1693839641; x=1694444441; darn=gcc.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=B1dn9F4+JPTuPKMJzBPrNODIuWwVkKnSXuYubsOeH10=; b=dTOCEvGaP6+4lZOx1wiQFzEjMAypZOVah2O6WmtDc19LANs6hMnbno5Y0gBydTzZue pCYjBb3Z7L8q4amVYXzQEoB+a6rqY/6Xma2qQe827xbQBswgiiFBMpyv18Ujxoerjour 8M2TK1slAEWe1Qr9HwjSMFOssLF6qGbwUObtw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693839641; x=1694444441; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B1dn9F4+JPTuPKMJzBPrNODIuWwVkKnSXuYubsOeH10=; b=Wy7DnydwK35++BmG10CDbG2IuIA7qBxcGLhgTVYy8rSnZmVm+KyoYGUgyWCQ2y8/RG dkzXEzkitnhCqUk7g8/cQxZfuaB7eLVjiZw0X755D+B64s/fXQWNSw15GuA1haEOFx/u jpb4czgFLn05fvLGYdehB5W3HgShjsnwD63eB+WAGb+KoIuDcwxNQFx7QbYo3yGpG5Po SBcTR2oQgN9vGdSiocZCJ66w3zs0ne/PkvQ1cZsPG3kfSVD+sg370koNqVMtL0FOfwDL b1d5bWqNmAi3ptf/rp2BOksJiIXFf/owUlb8LIM7aTcV9VmjODMTM4kcPnHMNnDvyJ3M vA/Q== X-Gm-Message-State: AOJu0Yz6CrK+NQnD0FvcqpqE/k13MKHHLd9wOc5+vwiHlsp/QJ6G1iwA iO2qtQMHq2yHlylHlqwIUt5S5yLUw56JCEcaJvRSzg== X-Google-Smtp-Source: AGHT+IE8nhVzO2tooxx2M6yL/ujmIBxHAyTBJTznm/Ct+rN4bMoOVCXAYdZnE2Cspu3m5eFwXfUeegpXd0pfXcEDQwg= X-Received: by 2002:a1f:e6c3:0:b0:48f:f1cc:a0d3 with SMTP id d186-20020a1fe6c3000000b0048ff1cca0d3mr5821000vkh.0.1693839641206; Mon, 04 Sep 2023 08:00:41 -0700 (PDT) MIME-Version: 1.0 References: <20230715045519.50684-1-kmatsui@gcc.gnu.org> <20230901112510.1562-1-kmatsui@gcc.gnu.org> In-Reply-To: <20230901112510.1562-1-kmatsui@gcc.gnu.org> From: Ken Matsui Date: Mon, 4 Sep 2023 08:00:00 -0700 Message-ID: Subject: Re: [PATCH v5 1/4] c++, libstdc++: Implement __is_arithmetic built-in trait To: jason@redhat.com Cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org, Ken Matsui Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Ping for __is_arithmetic built-in. Sincerely, Ken Matsui On Fri, Sep 1, 2023 at 4:25=E2=80=AFAM Ken Matsui wro= te: > > This patch implements built-in trait for std::is_arithmetic. > > gcc/cp/ChangeLog: > > * cp-trait.def: Define __is_arithmetic. > * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_ARITHMETIC. > * semantics.cc (trait_expr_value): Likewise. > (finish_trait_expr): Likewise. > > gcc/testsuite/ChangeLog: > > * g++.dg/ext/has-builtin-1.C: Test existence of __is_arithmetic. > * g++.dg/ext/is_arithmetic.C: New test. > * g++.dg/tm/pr46567.C (__is_arithmetic): Rename to ... > (__is_arith): ... this. > * g++.dg/torture/pr57107.C: Likewise. > > libstdc++-v3/ChangeLog: > > * include/bits/cpp_type_traits.h (__is_arithmetic): Rename to ... > (__is_arith): ... this. > * include/c_global/cmath: Use __is_arith instead. > * include/c_std/cmath: Likewise. > * include/tr1/cmath: Likewise. > > Signed-off-by: Ken Matsui > --- > gcc/cp/constraint.cc | 3 ++ > gcc/cp/cp-trait.def | 1 + > gcc/cp/semantics.cc | 4 ++ > gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++ > gcc/testsuite/g++.dg/ext/is_arithmetic.C | 33 ++++++++++++++ > gcc/testsuite/g++.dg/tm/pr46567.C | 6 +-- > gcc/testsuite/g++.dg/torture/pr57107.C | 4 +- > libstdc++-v3/include/bits/cpp_type_traits.h | 4 +- > libstdc++-v3/include/c_global/cmath | 48 ++++++++++----------- > libstdc++-v3/include/c_std/cmath | 24 +++++------ > libstdc++-v3/include/tr1/cmath | 24 +++++------ > 11 files changed, 99 insertions(+), 55 deletions(-) > create mode 100644 gcc/testsuite/g++.dg/ext/is_arithmetic.C > > diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc > index 8cf0f2d0974..bd517d08843 100644 > --- a/gcc/cp/constraint.cc > +++ b/gcc/cp/constraint.cc > @@ -3754,6 +3754,9 @@ diagnose_trait_expr (tree expr, tree args) > case CPTK_IS_AGGREGATE: > inform (loc, " %qT is not an aggregate", t1); > break; > + case CPTK_IS_ARITHMETIC: > + inform (loc, " %qT is not an arithmetic type", t1); > + break; > case CPTK_IS_TRIVIALLY_COPYABLE: > inform (loc, " %qT is not trivially copyable", t1); > break; > diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def > index 8b7fece0cc8..a95aeeaf778 100644 > --- a/gcc/cp/cp-trait.def > +++ b/gcc/cp/cp-trait.def > @@ -82,6 +82,7 @@ DEFTRAIT_EXPR (IS_TRIVIALLY_ASSIGNABLE, "__is_trivially= _assignable", 2) > DEFTRAIT_EXPR (IS_TRIVIALLY_CONSTRUCTIBLE, "__is_trivially_constructible= ", -1) > DEFTRAIT_EXPR (IS_TRIVIALLY_COPYABLE, "__is_trivially_copyable", 1) > DEFTRAIT_EXPR (IS_UNION, "__is_union", 1) > +DEFTRAIT_EXPR (IS_ARITHMETIC, "__is_arithmetic", 1) > DEFTRAIT_EXPR (REF_CONSTRUCTS_FROM_TEMPORARY, "__reference_constructs_fr= om_temporary", 2) > DEFTRAIT_EXPR (REF_CONVERTS_FROM_TEMPORARY, "__reference_converts_from_t= emporary", 2) > /* FIXME Added space to avoid direct usage in GCC 13. */ > diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc > index 8fb47fd179e..4531f047d73 100644 > --- a/gcc/cp/semantics.cc > +++ b/gcc/cp/semantics.cc > @@ -12118,6 +12118,9 @@ trait_expr_value (cp_trait_kind kind, tree type1,= tree type2) > case CPTK_IS_UNION: > return type_code1 =3D=3D UNION_TYPE; > > + case CPTK_IS_ARITHMETIC: > + return ARITHMETIC_TYPE_P (type1); > + > case CPTK_IS_ASSIGNABLE: > return is_xible (MODIFY_EXPR, type1, type2); > > @@ -12296,6 +12299,7 @@ finish_trait_expr (location_t loc, cp_trait_kind = kind, tree type1, tree type2) > case CPTK_IS_ENUM: > case CPTK_IS_UNION: > case CPTK_IS_SAME: > + case CPTK_IS_ARITHMETIC: > break; > > case CPTK_IS_LAYOUT_COMPATIBLE: > diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++= .dg/ext/has-builtin-1.C > index f343e153e56..3d63b0101d1 100644 > --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C > +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C > @@ -146,3 +146,6 @@ > #if !__has_builtin (__remove_cvref) > # error "__has_builtin (__remove_cvref) failed" > #endif > +#if !__has_builtin (__is_arithmetic) > +# error "__has_builtin (__is_arithmetic) failed" > +#endif > diff --git a/gcc/testsuite/g++.dg/ext/is_arithmetic.C b/gcc/testsuite/g++= .dg/ext/is_arithmetic.C > new file mode 100644 > index 00000000000..fd35831f646 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/ext/is_arithmetic.C > @@ -0,0 +1,33 @@ > +// { dg-do compile { target c++11 } } > + > +#include > + > +using namespace __gnu_test; > + > +#define SA(X) static_assert((X),#X) > +#define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \ > + SA(TRAIT(TYPE) =3D=3D EXPECT); \ > + SA(TRAIT(const TYPE) =3D=3D EXPECT); \ > + SA(TRAIT(volatile TYPE) =3D=3D EXPECT); \ > + SA(TRAIT(const volatile TYPE) =3D=3D EXPECT) > + > +SA_TEST_CATEGORY(__is_arithmetic, void, false); > + > +SA_TEST_CATEGORY(__is_arithmetic, char, true); > +SA_TEST_CATEGORY(__is_arithmetic, signed char, true); > +SA_TEST_CATEGORY(__is_arithmetic, unsigned char, true); > +SA_TEST_CATEGORY(__is_arithmetic, wchar_t, true); > +SA_TEST_CATEGORY(__is_arithmetic, short, true); > +SA_TEST_CATEGORY(__is_arithmetic, unsigned short, true); > +SA_TEST_CATEGORY(__is_arithmetic, int, true); > +SA_TEST_CATEGORY(__is_arithmetic, unsigned int, true); > +SA_TEST_CATEGORY(__is_arithmetic, long, true); > +SA_TEST_CATEGORY(__is_arithmetic, unsigned long, true); > +SA_TEST_CATEGORY(__is_arithmetic, long long, true); > +SA_TEST_CATEGORY(__is_arithmetic, unsigned long long, true); > +SA_TEST_CATEGORY(__is_arithmetic, float, true); > +SA_TEST_CATEGORY(__is_arithmetic, double, true); > +SA_TEST_CATEGORY(__is_arithmetic, long double, true); > + > +// Sanity check. > +SA_TEST_CATEGORY(__is_arithmetic, ClassType, false); > diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/= pr46567.C > index 6d791484448..8d2d3eb6c5a 100644 > --- a/gcc/testsuite/g++.dg/tm/pr46567.C > +++ b/gcc/testsuite/g++.dg/tm/pr46567.C > @@ -217,16 +217,16 @@ namespace std __attribute__ ((__visibility__ ("defa= ult"))) { > typedef __true_type __type; > }; > template > - struct __is_arithmetic > + struct __is_arith > : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > > { }; > template > struct __is_fundamental > - : public __traitor<__is_void<_Tp>, __is_arithmetic<_Tp> > > + : public __traitor<__is_void<_Tp>, __is_arith<_Tp> > > { }; > template > struct __is_scalar > - : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> > > + : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> > > { }; > template > struct __is_char > diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.d= g/torture/pr57107.C > index 4dbd32bd298..ecbe99db4f8 100644 > --- a/gcc/testsuite/g++.dg/torture/pr57107.C > +++ b/gcc/testsuite/g++.dg/torture/pr57107.C > @@ -25,9 +25,9 @@ namespace std __attribute__ ((__visibility__ ("default"= ))) { > enum { > __value =3D 0 }; > }; > - template struct __is_arithmetic : public __tra= itor<__is_integer<_Tp>, __is_floating<_Tp> > { > + template struct __is_arith : public __traitor<= __is_integer<_Tp>, __is_floating<_Tp> > { > }; > - template struct __is_scalar : public __traitor= <__is_arithmetic<_Tp>, __is_pointer<_Tp> > { > + template struct __is_scalar : public __traitor= <__is_arith<_Tp>, __is_pointer<_Tp> > { > }; > } > namespace __gnu_cxx __attribute__ ((__visibility__ ("default"))) { > diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/i= nclude/bits/cpp_type_traits.h > index 4312f32a4e0..d00d1ea8d75 100644 > --- a/libstdc++-v3/include/bits/cpp_type_traits.h > +++ b/libstdc++-v3/include/bits/cpp_type_traits.h > @@ -381,7 +381,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3) > // An arithmetic type is an integer type or a floating point type > // > template > - struct __is_arithmetic > + struct __is_arith > : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > > { }; > > @@ -390,7 +390,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3) > // > template > struct __is_scalar > - : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> > > + : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> > > { }; > > // > diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c= _global/cmath > index b0ba395eb5c..da3ef537c38 100644 > --- a/libstdc++-v3/include/c_global/cmath > +++ b/libstdc++-v3/include/c_global/cmath > @@ -1255,8 +1255,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT > template > constexpr typename > - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value > - && __is_arithmetic<_Up>::__value), bool>::__t= ype > + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value > + && __is_arith<_Up>::__value), bool>::__type > isgreater(_Tp __x, _Up __y) > { > typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; > @@ -1281,8 +1281,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT > template > constexpr typename > - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value > - && __is_arithmetic<_Up>::__value), bool>::__t= ype > + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value > + && __is_arith<_Up>::__value), bool>::__type > isgreaterequal(_Tp __x, _Up __y) > { > typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; > @@ -1307,8 +1307,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT > template > constexpr typename > - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value > - && __is_arithmetic<_Up>::__value), bool>::__t= ype > + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value > + && __is_arith<_Up>::__value), bool>::__type > isless(_Tp __x, _Up __y) > { > typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; > @@ -1333,8 +1333,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT > template > constexpr typename > - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value > - && __is_arithmetic<_Up>::__value), bool>::__t= ype > + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value > + && __is_arith<_Up>::__value), bool>::__type > islessequal(_Tp __x, _Up __y) > { > typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; > @@ -1359,8 +1359,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT > template > constexpr typename > - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value > - && __is_arithmetic<_Up>::__value), bool>::__t= ype > + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value > + && __is_arith<_Up>::__value), bool>::__type > islessgreater(_Tp __x, _Up __y) > { > typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; > @@ -1385,8 +1385,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT > template > constexpr typename > - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value > - && __is_arithmetic<_Up>::__value), bool>::__t= ype > + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value > + && __is_arith<_Up>::__value), bool>::__type > isunordered(_Tp __x, _Up __y) > { > typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type; > @@ -1397,7 +1397,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > #else > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > fpclassify(_Tp __f) > { > @@ -1407,7 +1407,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isfinite(_Tp __f) > { > @@ -1416,7 +1416,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isinf(_Tp __f) > { > @@ -1425,7 +1425,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isnan(_Tp __f) > { > @@ -1434,7 +1434,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isnormal(_Tp __f) > { > @@ -1443,7 +1443,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > signbit(_Tp __f) > { > @@ -1452,7 +1452,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isgreater(_Tp __f1, _Tp __f2) > { > @@ -1461,7 +1461,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isgreaterequal(_Tp __f1, _Tp __f2) > { > @@ -1470,7 +1470,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isless(_Tp __f1, _Tp __f2) > { > @@ -1479,7 +1479,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > islessequal(_Tp __f1, _Tp __f2) > { > @@ -1488,7 +1488,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > islessgreater(_Tp __f1, _Tp __f2) > { > @@ -1497,7 +1497,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isunordered(_Tp __f1, _Tp __f2) > { > diff --git a/libstdc++-v3/include/c_std/cmath b/libstdc++-v3/include/c_st= d/cmath > index 588ee1e6dc4..c1db699ecdb 100644 > --- a/libstdc++-v3/include/c_std/cmath > +++ b/libstdc++-v3/include/c_std/cmath > @@ -467,7 +467,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > #undef isunordered > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > fpclassify(_Tp __f) > { > @@ -477,7 +477,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isfinite(_Tp __f) > { > @@ -486,7 +486,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isinf(_Tp __f) > { > @@ -495,7 +495,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isnan(_Tp __f) > { > @@ -504,7 +504,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isnormal(_Tp __f) > { > @@ -513,7 +513,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > signbit(_Tp __f) > { > @@ -522,7 +522,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isgreater(_Tp __f1, _Tp __f2) > { > @@ -531,7 +531,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isgreaterequal(_Tp __f1, _Tp __f2) > { > @@ -540,7 +540,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isless(_Tp __f1, _Tp __f2) > { > @@ -549,7 +549,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > islessequal(_Tp __f1, _Tp __f2) > { > @@ -558,7 +558,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > islessgreater(_Tp __f1, _Tp __f2) > { > @@ -567,7 +567,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isunordered(_Tp __f1, _Tp __f2) > { > diff --git a/libstdc++-v3/include/tr1/cmath b/libstdc++-v3/include/tr1/cm= ath > index ba1b60cc945..2e80f1d0d00 100644 > --- a/libstdc++-v3/include/tr1/cmath > +++ b/libstdc++-v3/include/tr1/cmath > @@ -307,7 +307,7 @@ namespace tr1 > > /// Function template definitions [8.16.3]. > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > fpclassify(_Tp __f) > { > @@ -317,7 +317,7 @@ namespace tr1 > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isfinite(_Tp __f) > { > @@ -326,7 +326,7 @@ namespace tr1 > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isinf(_Tp __f) > { > @@ -335,7 +335,7 @@ namespace tr1 > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isnan(_Tp __f) > { > @@ -344,7 +344,7 @@ namespace tr1 > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isnormal(_Tp __f) > { > @@ -353,7 +353,7 @@ namespace tr1 > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > signbit(_Tp __f) > { > @@ -362,7 +362,7 @@ namespace tr1 > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isgreater(_Tp __f1, _Tp __f2) > { > @@ -371,7 +371,7 @@ namespace tr1 > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isgreaterequal(_Tp __f1, _Tp __f2) > { > @@ -380,7 +380,7 @@ namespace tr1 > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isless(_Tp __f1, _Tp __f2) > { > @@ -389,7 +389,7 @@ namespace tr1 > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > islessequal(_Tp __f1, _Tp __f2) > { > @@ -398,7 +398,7 @@ namespace tr1 > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > islessgreater(_Tp __f1, _Tp __f2) > { > @@ -407,7 +407,7 @@ namespace tr1 > } > > template > - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value= , > + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value, > int>::__type > isunordered(_Tp __f1, _Tp __f2) > { > -- > 2.42.0 >