diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 070ebf2b571d0a53f5a1b206a00607fe5b062f08..c19899826d35347432a991797533a304e6d8184c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,15 @@ +2013-06-08 Jonathan Wakely <jwakely.gcc@gmail.com> + + * include/std/type-traits (integral_constant::operator()): Implement + N3545. + * testsuite/20_util/integral_constant/call_operator.cc: New. + * testsuite/20_util/declval/requirements/1_neg.cc: Adjust dg-error + line numbers. + * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: + Likewise. + * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: + Likewise. + 2013-06-07 Uros Bizjak <ubizjak@gmail.com> * config/abi/post/alpha-linux-gnu/baseline_symbols.txt: Update. diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index a0a8327bec55879ce5c9879c55a05a6b76361bd5..99d0a5b6b845c14c1054fb4c97ab6f76531da44b 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -60,6 +60,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef _Tp value_type; typedef integral_constant<_Tp, __v> type; constexpr operator value_type() const { return value; } +#if __cplusplus > 201103L + constexpr value_type operator()() const { return value; } +#endif }; template<typename _Tp, _Tp __v> 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 ad821905a063f3434b533a6debd1b6e75f84a9f5..5b5a8eb3daf4c26b98745add0649286c0639116d 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 *-*-* } 1859 } +// { dg-error "static assertion failed" "" { target *-*-* } 1862 } #include <utility> diff --git a/libstdc++-v3/testsuite/20_util/integral_constant/call_operator.cc b/libstdc++-v3/testsuite/20_util/integral_constant/call_operator.cc new file mode 100644 index 0000000000000000000000000000000000000000..c5b0385240ed3f5c83cd2e8826f546e9e3990c1a --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/integral_constant/call_operator.cc @@ -0,0 +1,36 @@ +// { dg-do compile } +// { dg-options "-std=gnu++1y" } +// +// Copyright (C) 2013 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 copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +#include <type_traits> +#include <cassert> //testsuite_hooks.h> + +typedef std::integral_constant<int, 1> ic_one; +typedef std::integral_constant<int, 0> ic_zero; +typedef std::integral_constant<int, -1> ic_minus_one; + +typedef std::integral_constant<bool, true> ic_true; +typedef std::integral_constant<bool, false> ic_false; + +static_assert( ic_one{}() == 1, "1" ); +static_assert( ic_zero{}() == 0, "0" ); +static_assert( ic_minus_one{}() == -1, "-1" ); + +static_assert( ic_true{}() == true, "true" ); +static_assert( ic_false{}() == false, "false" ); 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 077e32797a66d1b5a555dcb8c13c8d83aad124fb..afb7336c375509aa1071036d482ef49ceb9412ec 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,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 *-*-* } 1601 } -// { dg-error "declaration of" "" { target *-*-* } 1565 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1604 } +// { dg-error "declaration of" "" { target *-*-* } 1568 } 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 2bc1cbbad12d358dbd856bef4cb33cec2ef3c43c..ba5f5827712ffb9693ec1cc3272f50174e980b0b 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 *-*-* } 1519 } -// { dg-error "declaration of" "" { target *-*-* } 1483 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1522 } +// { dg-error "declaration of" "" { target *-*-* } 1486 }