Skip to content
Snippets Groups Projects
Commit db113eda authored by Jonathan Wakely's avatar Jonathan Wakely Committed by Jonathan Wakely
Browse files

type-traits (integral_constant::operator()): Implement N3545.

	* 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.

From-SVN: r199853
parent 299316ed
No related branches found
No related tags found
No related merge requests found
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> 2013-06-07 Uros Bizjak <ubizjak@gmail.com>
* config/abi/post/alpha-linux-gnu/baseline_symbols.txt: Update. * config/abi/post/alpha-linux-gnu/baseline_symbols.txt: Update.
......
...@@ -60,6 +60,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -60,6 +60,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typedef _Tp value_type; typedef _Tp value_type;
typedef integral_constant<_Tp, __v> type; typedef integral_constant<_Tp, __v> type;
constexpr operator value_type() const { return value; } constexpr operator value_type() const { return value; }
#if __cplusplus > 201103L
constexpr value_type operator()() const { return value; }
#endif
}; };
template<typename _Tp, _Tp __v> template<typename _Tp, _Tp __v>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
// with this library; see the file COPYING3. If not see // with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>. // <http://www.gnu.org/licenses/>.
// { dg-error "static assertion failed" "" { target *-*-* } 1859 } // { dg-error "static assertion failed" "" { target *-*-* } 1862 }
#include <utility> #include <utility>
......
// { 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" );
...@@ -48,5 +48,5 @@ void test01() ...@@ -48,5 +48,5 @@ void test01()
// { dg-error "required from here" "" { target *-*-* } 40 } // { dg-error "required from here" "" { target *-*-* } 40 }
// { dg-error "required from here" "" { target *-*-* } 42 } // { dg-error "required from here" "" { target *-*-* } 42 }
// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1601 } // { dg-error "invalid use of incomplete type" "" { target *-*-* } 1604 }
// { dg-error "declaration of" "" { target *-*-* } 1565 } // { dg-error "declaration of" "" { target *-*-* } 1568 }
...@@ -48,5 +48,5 @@ void test01() ...@@ -48,5 +48,5 @@ void test01()
// { dg-error "required from here" "" { target *-*-* } 40 } // { dg-error "required from here" "" { target *-*-* } 40 }
// { dg-error "required from here" "" { target *-*-* } 42 } // { dg-error "required from here" "" { target *-*-* } 42 }
// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1519 } // { dg-error "invalid use of incomplete type" "" { target *-*-* } 1522 }
// { dg-error "declaration of" "" { target *-*-* } 1483 } // { dg-error "declaration of" "" { target *-*-* } 1486 }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment