From 6c5173c05f64ec30538661a0e68d1f691315dde4 Mon Sep 17 00:00:00 2001 From: Daniel Kruegler Date: Wed, 24 Oct 2012 20:37:05 +0000 Subject: [PATCH] type_traits (common_type): Implement LWG 2141. 2012-10-24 Daniel Krugler * include/std/type_traits (common_type): Implement LWG 2141. * testsuite/20_util/duration/requirements/sfinae_friendly_1.cc: Update. * testsuite/20_util/common_type/requirements/typedefs-1.cc: Likewise. * testsuite/20_util/common_type/requirements/sfinae_friendly_1.cc: Likewise. * testsuite/20_util/common_type/requirements/sfinae_friendly_2.cc: Likewise. * testsuite/20_util/common_type/requirements/typedefs-2.cc: Likewise. From-SVN: r192780 --- libstdc++-v3/ChangeLog | 20 ++++- libstdc++-v3/include/std/type_traits | 6 +- .../requirements/sfinae_friendly_1.cc | 88 ++++++++----------- .../requirements/sfinae_friendly_2.cc | 21 ++++- .../common_type/requirements/typedefs-1.cc | 2 +- .../common_type/requirements/typedefs-2.cc | 9 +- .../requirements/sfinae_friendly_1.cc | 9 +- 7 files changed, 80 insertions(+), 75 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0c8061fd8a6d..d0a915dea6d8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,15 @@ +2012-10-24 Daniel Krugler + + * include/std/type_traits (common_type): Implement LWG 2141. + * testsuite/20_util/duration/requirements/sfinae_friendly_1.cc: + Update. + * testsuite/20_util/common_type/requirements/typedefs-1.cc: Likewise. + * testsuite/20_util/common_type/requirements/sfinae_friendly_1.cc: + Likewise. + * testsuite/20_util/common_type/requirements/sfinae_friendly_2.cc: + Likewise. + * testsuite/20_util/common_type/requirements/typedefs-2.cc: Likewise. + 2012-10-24 Haakan Younes Paolo Carlini @@ -247,7 +259,7 @@ * testsuite/23_containers/bitset/45713.cc: Skip for avr*-*-* cris*-*-* h8300*-*-* mcore*-*-* moxie*-*-*. -2012-10-11 Daniel Krugler +2012-10-11 Daniel Krugler * testsuite/20_util/common_type/requirements/sfinae_friendly_1.cc: Update / extend. @@ -289,7 +301,7 @@ * testsuite/20_util/common_type/requirements/sfinae_friendly_1.cc: Adjust. -2012-10-09 Daniel Krugler +2012-10-09 Daniel Krugler * include/std/type_traits (common_time): Provide "SFINAE-friendly" implementation. @@ -466,7 +478,7 @@ * include/ext/random.tcc (rice_distribution<>::__generate_impl): Likewise. -2012-10-01 Daniel Krugler +2012-10-01 Daniel Krugler * include/std/type_traits (result_of): Provide "SFINAE-friendly" (see N3436) implementation. @@ -1810,7 +1822,7 @@ PR libstdc++/52689 * testsuite/17_intro/static.cc: New. -2012-04-23 Daniel Krugler +2012-04-23 Daniel Krugler * include/std/type_traits (is_nothrow_destructible): Implement. (is_destructible): Implement LWG 2049. diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 510b012a3e1c..11f06c13e904 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -1792,9 +1792,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct __do_common_type_impl { template - static __success_type() - : std::declval<_Up>())> _S_test(int); + : std::declval<_Up>())>::type> _S_test(int); template static __failure_type _S_test(...); @@ -1835,7 +1835,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template struct common_type<_Tp> - { typedef _Tp type; }; + { typedef typename decay<_Tp>::type type; }; template struct common_type<_Tp, _Up> diff --git a/libstdc++-v3/testsuite/20_util/common_type/requirements/sfinae_friendly_1.cc b/libstdc++-v3/testsuite/20_util/common_type/requirements/sfinae_friendly_1.cc index f73c6cc6dd52..d7f3f2eba1f0 100644 --- a/libstdc++-v3/testsuite/20_util/common_type/requirements/sfinae_friendly_1.cc +++ b/libstdc++-v3/testsuite/20_util/common_type/requirements/sfinae_friendly_1.cc @@ -163,23 +163,19 @@ namespace std { }; } -#ifdef HAS_53000_FIXED -static_assert(is_type, int&&>(), ""); -static_assert(is_type, ScEn&&>(), ""); -static_assert(is_type, UnscEn&&>(), ""); -#endif +static_assert(is_type, int>(), ""); +static_assert(is_type, ScEn>(), ""); +static_assert(is_type, UnscEn>(), ""); static_assert(is_type, int>(), ""); -#ifdef HAS_53000_FIXED -static_assert(is_type, int&&>(), ""); -static_assert(is_type, int&&>(), ""); -static_assert(is_type, int&&>(), ""); -static_assert(is_type, S&&>(), ""); -static_assert(is_type, const S&&>(), ""); +static_assert(is_type, int>(), ""); +static_assert(is_type, int>(), ""); +static_assert(is_type, int>(), ""); +static_assert(is_type, S>(), ""); +static_assert(is_type, S>(), ""); static_assert(is_type, - std::initializer_list>, std::initializer_list&&>(), ""); -static_assert(is_type, B&&>(), ""); -static_assert(is_type, B&&>(), ""); -#endif + std::initializer_list>, std::initializer_list>(), ""); +static_assert(is_type, B>(), ""); +static_assert(is_type, B>(), ""); static_assert(is_type, void*>(), ""); static_assert(is_type, void*>(), ""); static_assert(is_type, const volatile void*>(), ""); @@ -191,16 +187,12 @@ static_assert(is_type, static_assert(is_type, void>(), ""); static_assert(is_type, void>(), ""); static_assert(is_type, int>(), ""); -static_assert(is_type, int&>(), ""); -#ifdef HAS_53000_FIXED -static_assert(is_type, int&&>(), ""); -static_assert(is_type, const int&&>(), ""); -#endif -static_assert(is_type, const U>(), ""); -static_assert(is_type, U&>(), ""); -#ifdef HAS_53000_FIXED -static_assert(is_type, U&&>(), ""); -#endif +static_assert(is_type, int>(), ""); +static_assert(is_type, int>(), ""); +static_assert(is_type, int>(), ""); +static_assert(is_type, U>(), ""); +static_assert(is_type, U>(), ""); +static_assert(is_type, U>(), ""); static_assert(is_type, int D::*>(), ""); static_assert(is_type, int D::*>(), ""); static_assert(is_type, @@ -209,34 +201,28 @@ static_assert(is_type, int (D::*)()>(), ""); static_assert(is_type, int (D::*)() const>(), ""); -#ifdef HAS_53000_FIXED -static_assert(is_type, int(&&)[3]>(), ""); -#endif +static_assert(is_type, int*>(), ""); static_assert(is_type, const int*>(), ""); -static_assert(is_type, void(&)()>(), ""); -static_assert(is_type, void(&)()>(), ""); +static_assert(is_type, void(*)()>(), ""); +static_assert(is_type, void(*)()>(), ""); static_assert(is_type, - void(&)()>(), ""); + void(*)()>(), ""); static_assert(is_type, - void(&)()>(), ""); + void(*)()>(), ""); static_assert(is_type, - void(&)()>(), ""); + void(*)()>(), ""); static_assert(is_type, int>, int>(), ""); -#ifdef HAS_53000_FIXED static_assert(is_type, ImplicitTo>, - ImplicitTo&&>(), ""); -#endif + ImplicitTo>(), ""); static_assert(is_type, int, ImplicitTo>, int>(), ""); -#ifdef HAS_53000_FIXED static_assert(is_type, ExplicitTo>, - ExplicitTo&&>(), ""); + ExplicitTo>(), ""); static_assert(is_type, - decltype(lmd1)&&>(), ""); -#endif + decltype(lmd1)>(), ""); static_assert(is_type, - decltype(lmd1)&>(), ""); + decltype(lmd1)>(), ""); static_assert(is_type, void(*)(int, double)>(), ""); static_assert(is_type, void*>(), ""); @@ -251,9 +237,9 @@ static_assert(is_type, int (B::*)() const>(), ""); static_assert(is_type, const int B::*>(), ""); -static_assert(is_type, Abstract&>(), ""); -static_assert(is_type, Ukn&>(), ""); -static_assert(is_type, B&>, B&>(), ""); +static_assert(is_type, Abstract>(), ""); +static_assert(is_type, Ukn>(), ""); +static_assert(is_type, B&>, B>(), ""); static_assert(is_type&, B&&>, B>(), ""); static_assert(is_type, const Abstract*>(), ""); @@ -262,12 +248,12 @@ static_assert(is_type, Abstract*>(), ""); #ifdef HAS_53000_FIXED static_assert(is_type, - Abstract&&>(), ""); + Abstract>(), ""); static_assert(is_type, const volatile Abstract&&>(), ""); -static_assert(is_type, Ukn&&>(), ""); + volatile Abstract&&>, Abstract>(), ""); +static_assert(is_type, Ukn>(), ""); static_assert(is_type, - const volatile Ukn&&>(), ""); + Ukn>(), ""); #endif static_assert(is_type, RX12>(), ""); @@ -337,14 +323,12 @@ void test(int i) auto local_lmd1 = [=](int, double) { return i + i; }; auto local_lmd2 = [=](int, double) { return i - i; }; -#ifdef HAS_53000_FIXED static_assert(is_type, decltype(local_lmd1)&&>(), ""); -#endif + decltype(local_lmd1)>, decltype(local_lmd1)>(), ""); static_assert(is_type, decltype(local_lmd1)>(), ""); static_assert(is_type, decltype(local_lmd1)&>(), ""); + decltype(local_lmd1)&>, decltype(local_lmd1)>(), ""); static_assert(!has_type>(), ""); diff --git a/libstdc++-v3/testsuite/20_util/common_type/requirements/sfinae_friendly_2.cc b/libstdc++-v3/testsuite/20_util/common_type/requirements/sfinae_friendly_2.cc index 2f667919ea51..2ab5d94141a3 100644 --- a/libstdc++-v3/testsuite/20_util/common_type/requirements/sfinae_friendly_2.cc +++ b/libstdc++-v3/testsuite/20_util/common_type/requirements/sfinae_friendly_2.cc @@ -24,12 +24,11 @@ template constexpr -std::array::type>::type, +std::array::type, sizeof...(Args)> make_array(Args&&... args) // { dg-error "invalid use" } { - typedef typename std::decay::type>::type - CT; + typedef typename std::common_type::type CT; return std::array{static_cast (std::forward(args))...}; } @@ -39,10 +38,26 @@ void test01() constexpr auto a1 = make_array(0); constexpr auto a2 = make_array(0, 1.2); constexpr auto a3 = make_array(5, true, 3.1415f, 'c'); + + int i{}; + double d{1.2}; + float f{3.1415f}; + + auto b1 = make_array(i); + auto b2 = make_array(i, 1.2); + auto b3 = make_array(i, d); + auto b4 = make_array(0, d); + auto b5 = make_array(i, true, f, 'c'); static_assert(std::is_same>(), ""); static_assert(std::is_same>(), ""); static_assert(std::is_same>(), ""); + + static_assert(std::is_same>(), ""); + static_assert(std::is_same>(), ""); + static_assert(std::is_same>(), ""); + static_assert(std::is_same>(), ""); + static_assert(std::is_same>(), ""); } void test02() diff --git a/libstdc++-v3/testsuite/20_util/common_type/requirements/typedefs-1.cc b/libstdc++-v3/testsuite/20_util/common_type/requirements/typedefs-1.cc index 4564b2bc0c96..2d6babef02c7 100644 --- a/libstdc++-v3/testsuite/20_util/common_type/requirements/typedefs-1.cc +++ b/libstdc++-v3/testsuite/20_util/common_type/requirements/typedefs-1.cc @@ -105,7 +105,7 @@ void test02() COMMON_TYPE_TEST_ALL_2(int, int, int, 1); COMMON_TYPE_TEST_ALL_2(int, double, double, 2); COMMON_TYPE_TEST_2(NO_CV, A, A, A, 3); - COMMON_TYPE_TEST_2(const, A, A, const A, 4); + COMMON_TYPE_TEST_2(const, A, A, A, 4); COMMON_TYPE_TEST_2(NO_CV, B, A, A, 5); } diff --git a/libstdc++-v3/testsuite/20_util/common_type/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/common_type/requirements/typedefs-2.cc index b4a96e5406c2..3fd3024c682b 100644 --- a/libstdc++-v3/testsuite/20_util/common_type/requirements/typedefs-2.cc +++ b/libstdc++-v3/testsuite/20_util/common_type/requirements/typedefs-2.cc @@ -1,7 +1,7 @@ // { dg-options "-std=gnu++0x" } // 2009-11-12 Paolo Carlini // -// Copyright (C) 2009 Free Software Foundation, Inc. +// Copyright (C) 2009-2012 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 @@ -29,10 +29,9 @@ void test01() using std::is_same; VERIFY( (is_same::type, void>::value) ); - VERIFY( (is_same::type, const void>::value) ); - VERIFY( (is_same::type, volatile void>::value) ); - VERIFY( (is_same::type, - const volatile void>::value) ); + VERIFY( (is_same::type, void>::value) ); + VERIFY( (is_same::type, void>::value) ); + VERIFY( (is_same::type, void>::value) ); VERIFY( (is_same::type, void>::value) ); VERIFY( (is_same::type, void>::value) ); diff --git a/libstdc++-v3/testsuite/20_util/duration/requirements/sfinae_friendly_1.cc b/libstdc++-v3/testsuite/20_util/duration/requirements/sfinae_friendly_1.cc index cf53a21752d2..48b0197d9116 100644 --- a/libstdc++-v3/testsuite/20_util/duration/requirements/sfinae_friendly_1.cc +++ b/libstdc++-v3/testsuite/20_util/duration/requirements/sfinae_friendly_1.cc @@ -21,9 +21,6 @@ #include #include -//TODO: Uncomment this once gcc bug 53000 has been resolved: -//#define HAS_53000_FIXED - // Helper types: struct has_type_impl { @@ -55,10 +52,8 @@ typedef std::chrono::duration din; typedef std::chrono::duration ddn; typedef std::chrono::duration dim; -#ifdef HAS_53000_FIXED -static_assert(is_type, din&&>(), ""); -static_assert(is_type, din&&>(), ""); -#endif +static_assert(is_type, din>(), ""); +static_assert(is_type, din>(), ""); static_assert(is_type, ddn>(), ""); static_assert(is_type, ddn>(), "");