[v3] Implement C++17 variable templates for type traits.

Message ID	CAFk2RUai1gzyYV53m7ETaQOngvitWZkhieeK5OGJ9iOczwPckw@mail.gmail.com
State	New
Headers	show Return-Path: <gcc-patches-return-432854-incoming=patchwork.ozlabs.org@gcc.gnu.org> DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; q=dns; s=default; b=vnQcdetWoXsH3Z4 ieLmqpJYMfvbBKX15quiRy5f2pJWLgkg+Os13jdIiuDTMzdTwYmL3bO5aN0+yAXv KNycYdRqa6WmUFy7YH/Azcf3ec/ea14p+1M4vL1HsPBb/qFTkHGAo93iclNZtDLG U0SiPR9Hb327x8/Z0gQiG5odi1kU= Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org MIME-Version: 1.0 In-Reply-To: <CAFk2RUZqUKFNbrY4vXYTpMs9Qq_RYWx9X1LeYqWcuGQEuv=E_Q@mail.gmail.com> References: <CAFk2RUY=EOYYVd5fuHQNoWSO76EK=1YkqV-cW86r+AopWAX8vg@mail.gmail.com> <20160729185514.GJ4264@redhat.com> <CAFk2RUaVhgFh33k5kAR0KvReKiK7TVLxn4=e_=-Ceo2bzJBR1g@mail.gmail.com> <20160731114953.GL4264@redhat.com> <CAFk2RUZqUKFNbrY4vXYTpMs9Qq_RYWx9X1LeYqWcuGQEuv=E_Q@mail.gmail.com> From: Ville Voutilainen <ville.voutilainen@gmail.com> Date: Sun, 31 Jul 2016 15:50:55 +0300 Message-ID: <CAFk2RUai1gzyYV53m7ETaQOngvitWZkhieeK5OGJ9iOczwPckw@mail.gmail.com> Subject: Re: [v3 PATCH] Implement C++17 variable templates for type traits. To: Jonathan Wakely <jwakely@redhat.com> Cc: "libstdc++" <libstdc++@gcc.gnu.org>, "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org> Content-Type: multipart/mixed; boundary=001a113ab81a47a28c0538edef20

diff --git a/libstdc++-v3/include/bits/uses_allocator.h b/libstdc++-v3/include/bits/uses_allocator.h index b1ff58a..8fdeda7 100644 --- a/libstdc++-v3/include/bits/uses_allocator.h +++ b/libstdc++-v3/include/bits/uses_allocator.h @@ -108,8 +108,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __ret._M_a = std::__addressof(__a); return __ret; } +#if __cplusplus > 201402L + template <typename _Tp, typename _Alloc> + constexpr bool uses_allocator_v = uses_allocator<_Tp, _Alloc>::value; +#endif // C++17 -_GLIBCXX_END_NAMESPACE_VERSION + _GLIBCXX_END_NAMESPACE_VERSION } // namespace std #endif diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 0fdf043..97745ae 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -682,6 +682,13 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type) : public integral_constant<int, 0> { }; +#if __cplusplus > 201402L + template <typename _Tp> constexpr bool is_bind_expression_v + = is_bind_expression<_Tp>::value; + template <typename _Tp> constexpr int is_placeholder_v + = is_placeholder<_Tp>::value; +#endif // C++17 + /** @brief The type of placeholder objects defined by libstdc++. * @ingroup binders */ diff --git a/libstdc++-v3/testsuite/20_util/bind/is_placeholder_v.cc b/libstdc++-v3/testsuite/20_util/bind/is_placeholder_v.cc new file mode 100644 index 0000000..ef66883 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/bind/is_placeholder_v.cc @@ -0,0 +1,37 @@ +// { dg-options "-std=gnu++17" } +// { dg-do compile } + +// Copyright (C) 2014-2016 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a moved_to of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +#include <functional> + +struct X +{ + int operator()() const { return 0; } + int operator()() volatile { return 1; } + int operator()() const volatile { return 2; } + void operator()() { }; +}; + +static_assert( std::is_placeholder<decltype(std::placeholders::_1)>::value + == std::is_placeholder_v<decltype(std::placeholders::_1)>); + +const auto b0 = std::bind(X()); +static_assert( std::is_bind_expression<decltype(b0)>::value + == std::is_bind_expression_v<decltype(b0)>); + diff --git a/libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc b/libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc index 72246b8..558b8c6 100644 --- a/libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc +++ b/libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc @@ -19,7 +19,7 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. -// { dg-error "static assertion failed" "" { target *-*-* } 2259 } +// { dg-error "static assertion failed" "" { target *-*-* } 2272 } #include <utility> diff --git a/libstdc++-v3/testsuite/20_util/duration/literals/range.cc b/libstdc++-v3/testsuite/20_util/duration/literals/range.cc index dbb4af1..6fe4bde 100644 --- a/libstdc++-v3/testsuite/20_util/duration/literals/range.cc +++ b/libstdc++-v3/testsuite/20_util/duration/literals/range.cc @@ -27,5 +27,5 @@ test01() // std::numeric_limits<int64_t>::max() == 9223372036854775807; auto h = 9223372036854775808h; - // { dg-error "cannot be represented" "" { target *-*-* } 796 } + // { dg-error "cannot be represented" "" { target *-*-* } 800 } } diff --git a/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg1.cc b/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg1.cc index 14814b4..731a4a7 100644 --- a/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg1.cc +++ b/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg1.cc @@ -31,5 +31,5 @@ void test01() test_type d; } -// { dg-error "rep cannot be a duration" "" { target *-*-* } 246 } +// { dg-error "rep cannot be a duration" "" { target *-*-* } 250 } // { dg-error "required from here" "" { target *-*-* } 31 } diff --git a/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg2.cc b/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg2.cc index a71a889..c32b885 100644 --- a/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg2.cc +++ b/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg2.cc @@ -32,5 +32,5 @@ void test01() test_type d; // { dg-error "required from here" } } -// { dg-error "must be a specialization of ratio" "" { target *-*-* } 247 } +// { dg-error "must be a specialization of ratio" "" { target *-*-* } 251 } // { dg-prune-output "not a member" } diff --git a/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg3.cc b/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg3.cc index 016dc81..2369440 100644 --- a/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg3.cc +++ b/libstdc++-v3/testsuite/20_util/duration/requirements/typedefs_neg3.cc @@ -33,5 +33,5 @@ void test01() test_type d; } -// { dg-error "period must be positive" "" { target *-*-* } 249 } +// { dg-error "period must be positive" "" { target *-*-* } 253 } // { dg-error "required from here" "" { target *-*-* } 33 } diff --git a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc index 7724579..5e8fc47 100644 --- a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc +++ b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc @@ -48,4 +48,4 @@ void test01() // { dg-error "required from here" "" { target *-*-* } 40 } // { dg-error "required from here" "" { target *-*-* } 42 } -// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1924 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1937 } diff --git a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc index 75fadf4..52f89f3 100644 --- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc +++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc @@ -48,5 +48,5 @@ void test01() // { dg-error "required from here" "" { target *-*-* } 40 } // { dg-error "required from here" "" { target *-*-* } 42 } -// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1820 } -// { dg-error "declaration of" "" { target *-*-* } 1777 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1833 } +// { dg-error "declaration of" "" { target *-*-* } 1790 } diff --git a/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow_neg.cc b/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow_neg.cc index 0efa556..1a6bc52 100644 --- a/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow_neg.cc +++ b/libstdc++-v3/testsuite/20_util/ratio/operations/ops_overflow_neg.cc @@ -42,7 +42,7 @@ test02() // { dg-error "required from here" "" { target *-*-* } 29 } // { dg-error "expected initializer" "" { target *-*-* } 36 } // { dg-error "expected initializer" "" { target *-*-* } 38 } -// { dg-error "overflow in addition" "" { target *-*-* } 435 } +// { dg-error "overflow in addition" "" { target *-*-* } 451 } // { dg-error "overflow in multiplication" "" { target *-*-* } 97 } // { dg-error "overflow in multiplication" "" { target *-*-* } 99 } // { dg-error "overflow in multiplication" "" { target *-*-* } 101 } diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/requirements/uses_allocator_v.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/requirements/uses_allocator_v.cc new file mode 100644 index 0000000..cc6e790 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/uses_allocator/requirements/uses_allocator_v.cc @@ -0,0 +1,29 @@ +// { dg-options "-std=gnu++17" } +// { dg-do compile } + +// Copyright (C) 2016 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a moved_to of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +#include <memory> +#include <string> + +using namespace std; + +static_assert(uses_allocator<int, allocator<int>>::value + == uses_allocator_v<int, allocator<int>>); +static_assert(uses_allocator<string, allocator<string>>::value + == uses_allocator_v<string, allocator<string>>);

[v3] Implement C++17 variable templates for type traits.

Commit Message

Comments

Patch