diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2015-01-08 16:24:55 +0000 |
---|---|---|
committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-01-08 16:24:55 +0000 |
commit | c66b93fe2071248e4ef3cfc84449743d022c56dd (patch) | |
tree | bd27df68529d52f8ee4a1aa2f0c81b204c491915 | |
parent | b335ef4e999eb11741b0ebb89987a57c09c18028 (diff) | |
download | gcc-c66b93fe2071248e4ef3cfc84449743d022c56dd.zip gcc-c66b93fe2071248e4ef3cfc84449743d022c56dd.tar.gz gcc-c66b93fe2071248e4ef3cfc84449743d022c56dd.tar.bz2 |
re PR libstdc++/60132 (C++11: lack of is_trivially_copy_constructible)
PR libstdc++/60132
* include/std/type_traits (has_trivial_default_constructor,
has_trivial_copy_constructor, has_trivial_copy_assign): Add deprecated
attribute.
* testsuite/20_util/has_trivial_copy_assign/requirements/
explicit_instantiation.cc: Use -Wno-deprecated.
* testsuite/20_util/has_trivial_copy_assign/requirements/typedefs.cc:
Likewise.
* testsuite/20_util/has_trivial_copy_assign/value.cc: Likewise.
* testsuite/20_util/has_trivial_copy_constructor/requirements/
explicit_instantiation.cc: Likewise.
* testsuite/20_util/has_trivial_copy_constructor/requirements/
typedefs.cc: Likewise.
* testsuite/20_util/has_trivial_copy_constructor/value.cc: Likewise.
* testsuite/20_util/has_trivial_default_constructor/requirements/
explicit_instantiation.c: Likewise.
* testsuite/20_util/has_trivial_default_constructor/requirements/
typedefs.cc: Likewise.
* testsuite/20_util/has_trivial_default_constructor/value.cc:
Likewise.
* testsuite/20_util/pair/requirements/dr801.cc: Replace deprecated
trait.
* testsuite/20_util/tuple/requirements/dr801.cc: Likewise.
* testsuite/util/testsuite_common_types.h: Likewise.
From-SVN: r219350
14 files changed, 42 insertions, 15 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7e26165..85b08fa 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,32 @@ 2015-01-08 Jonathan Wakely <jwakely@redhat.com> + PR libstdc++/60132 + * include/std/type_traits (has_trivial_default_constructor, + has_trivial_copy_constructor, has_trivial_copy_assign): Add deprecated + attribute. + * testsuite/20_util/has_trivial_copy_assign/requirements/ + explicit_instantiation.cc: Use -Wno-deprecated. + * testsuite/20_util/has_trivial_copy_assign/requirements/typedefs.cc: + Likewise. + * testsuite/20_util/has_trivial_copy_assign/value.cc: Likewise. + * testsuite/20_util/has_trivial_copy_constructor/requirements/ + explicit_instantiation.cc: Likewise. + * testsuite/20_util/has_trivial_copy_constructor/requirements/ + typedefs.cc: Likewise. + * testsuite/20_util/has_trivial_copy_constructor/value.cc: Likewise. + * testsuite/20_util/has_trivial_default_constructor/requirements/ + explicit_instantiation.c: Likewise. + * testsuite/20_util/has_trivial_default_constructor/requirements/ + typedefs.cc: Likewise. + * testsuite/20_util/has_trivial_default_constructor/value.cc: + Likewise. + * testsuite/20_util/pair/requirements/dr801.cc: Replace deprecated + trait. + * testsuite/20_util/tuple/requirements/dr801.cc: Likewise. + * testsuite/util/testsuite_common_types.h: Likewise. + +2015-01-08 Jonathan Wakely <jwakely@redhat.com> + * include/bits/hashtable_policy.h: Use __bool_constant. 2015-01-07 Jonathan Wakely <jwakely@redhat.com> diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 4397c16..03e198a 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -1382,19 +1382,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Tp> struct has_trivial_default_constructor : public integral_constant<bool, __has_trivial_constructor(_Tp)> - { }; + { } _GLIBCXX_DEPRECATED; /// has_trivial_copy_constructor (temporary legacy) template<typename _Tp> struct has_trivial_copy_constructor : public integral_constant<bool, __has_trivial_copy(_Tp)> - { }; + { } _GLIBCXX_DEPRECATED; /// has_trivial_copy_assign (temporary legacy) template<typename _Tp> struct has_trivial_copy_assign : public integral_constant<bool, __has_trivial_assign(_Tp)> - { }; + { } _GLIBCXX_DEPRECATED; /// has_virtual_destructor template<typename _Tp> diff --git a/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/requirements/explicit_instantiation.cc index 19b4c99..1b2c02b 100644 --- a/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/requirements/explicit_instantiation.cc +++ b/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/requirements/explicit_instantiation.cc @@ -1,4 +1,4 @@ -// { dg-options "-std=gnu++11" } +// { dg-options "-std=gnu++11 -Wno-deprecated" } // { dg-do compile } // 2010-06-08 Paolo Carlini <paolo.carlini@oracle.com> diff --git a/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/requirements/typedefs.cc b/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/requirements/typedefs.cc index 3044ec3..c5fd5ec 100644 --- a/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/requirements/typedefs.cc +++ b/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/requirements/typedefs.cc @@ -1,4 +1,4 @@ -// { dg-options "-std=gnu++11" } +// { dg-options "-std=gnu++11 -Wno-deprecated" } // 2010-06-08 Paolo Carlini <paolo.carlini@oracle.com> // // Copyright (C) 2010-2015 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/value.cc b/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/value.cc index 1cfafaa..bd778ad 100644 --- a/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/value.cc +++ b/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/value.cc @@ -1,4 +1,4 @@ -// { dg-options "-std=gnu++11" } +// { dg-options "-std=gnu++11 -Wno-deprecated" } // { dg-do compile } // 2010-06-08 Paolo Carlini <paolo.carlini@oracle.com> diff --git a/libstdc++-v3/testsuite/20_util/has_trivial_copy_constructor/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/20_util/has_trivial_copy_constructor/requirements/explicit_instantiation.cc index 0e28a4f..6517852 100644 --- a/libstdc++-v3/testsuite/20_util/has_trivial_copy_constructor/requirements/explicit_instantiation.cc +++ b/libstdc++-v3/testsuite/20_util/has_trivial_copy_constructor/requirements/explicit_instantiation.cc @@ -1,4 +1,4 @@ -// { dg-options "-std=gnu++11" } +// { dg-options "-std=gnu++11 -Wno-deprecated" } // { dg-do compile } // 2007-04-30 Benjamin Kosnik <bkoz@redhat.com> diff --git a/libstdc++-v3/testsuite/20_util/has_trivial_copy_constructor/requirements/typedefs.cc b/libstdc++-v3/testsuite/20_util/has_trivial_copy_constructor/requirements/typedefs.cc index 1df20b7..0eb1e39 100644 --- a/libstdc++-v3/testsuite/20_util/has_trivial_copy_constructor/requirements/typedefs.cc +++ b/libstdc++-v3/testsuite/20_util/has_trivial_copy_constructor/requirements/typedefs.cc @@ -1,4 +1,4 @@ -// { dg-options "-std=gnu++11" } +// { dg-options "-std=gnu++11 -Wno-deprecated" } // 2004-12-30 Paolo Carlini <pcarlini@suse.de> // // Copyright (C) 2004-2015 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/20_util/has_trivial_copy_constructor/value.cc b/libstdc++-v3/testsuite/20_util/has_trivial_copy_constructor/value.cc index 2848e42..ea58a22 100644 --- a/libstdc++-v3/testsuite/20_util/has_trivial_copy_constructor/value.cc +++ b/libstdc++-v3/testsuite/20_util/has_trivial_copy_constructor/value.cc @@ -1,4 +1,4 @@ -// { dg-options "-std=gnu++11" } +// { dg-options "-std=gnu++11 -Wno-deprecated" } // { dg-do compile } // 2004-12-30 Paolo Carlini <pcarlini@suse.de> diff --git a/libstdc++-v3/testsuite/20_util/has_trivial_default_constructor/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/20_util/has_trivial_default_constructor/requirements/explicit_instantiation.cc index 0bb4ab9..66d72d9 100644 --- a/libstdc++-v3/testsuite/20_util/has_trivial_default_constructor/requirements/explicit_instantiation.cc +++ b/libstdc++-v3/testsuite/20_util/has_trivial_default_constructor/requirements/explicit_instantiation.cc @@ -1,4 +1,4 @@ -// { dg-options "-std=gnu++11" } +// { dg-options "-std=gnu++11 -Wno-deprecated" } // { dg-do compile } // 2007-04-30 Benjamin Kosnik <bkoz@redhat.com> diff --git a/libstdc++-v3/testsuite/20_util/has_trivial_default_constructor/requirements/typedefs.cc b/libstdc++-v3/testsuite/20_util/has_trivial_default_constructor/requirements/typedefs.cc index 806b66c..8eb7dc5 100644 --- a/libstdc++-v3/testsuite/20_util/has_trivial_default_constructor/requirements/typedefs.cc +++ b/libstdc++-v3/testsuite/20_util/has_trivial_default_constructor/requirements/typedefs.cc @@ -1,4 +1,4 @@ -// { dg-options "-std=gnu++11" } +// { dg-options "-std=gnu++11 -Wno-deprecated" } // 2004-12-26 Paolo Carlini <pcarlini@suse.de> // // Copyright (C) 2004-2015 Free Software Foundation, Inc. diff --git a/libstdc++-v3/testsuite/20_util/has_trivial_default_constructor/value.cc b/libstdc++-v3/testsuite/20_util/has_trivial_default_constructor/value.cc index 669c7e0..7111274 100644 --- a/libstdc++-v3/testsuite/20_util/has_trivial_default_constructor/value.cc +++ b/libstdc++-v3/testsuite/20_util/has_trivial_default_constructor/value.cc @@ -1,4 +1,4 @@ -// { dg-options "-std=gnu++11" } +// { dg-options "-std=gnu++11 -Wno-deprecated" } // { dg-do compile } // 2004-12-26 Paolo Carlini <pcarlini@suse.de> diff --git a/libstdc++-v3/testsuite/20_util/pair/requirements/dr801.cc b/libstdc++-v3/testsuite/20_util/pair/requirements/dr801.cc index f44774c..408ac5d 100644 --- a/libstdc++-v3/testsuite/20_util/pair/requirements/dr801.cc +++ b/libstdc++-v3/testsuite/20_util/pair/requirements/dr801.cc @@ -27,7 +27,7 @@ void test_trivial() // PODType, TType, NType, SLType, LType, NLType, LTypeDerived typedef std::pair<int, int> pair_type; // static_assert(std::is_literal_type<pair_type>::value, "! literal"); - static_assert(std::has_trivial_copy_constructor<pair_type>::value, + static_assert(std::is_trivially_copy_constructible<pair_type>::value, "! triv copy"); static_assert(std::is_trivially_destructible<pair_type>::value, "! triv destructor"); diff --git a/libstdc++-v3/testsuite/20_util/tuple/requirements/dr801.cc b/libstdc++-v3/testsuite/20_util/tuple/requirements/dr801.cc index d8992c1..c9358ee 100644 --- a/libstdc++-v3/testsuite/20_util/tuple/requirements/dr801.cc +++ b/libstdc++-v3/testsuite/20_util/tuple/requirements/dr801.cc @@ -27,7 +27,7 @@ void test_trivial() // PODType, TType, NType, SLType, LType, NLType, LTypeDerived typedef std::tuple<int, int> tuple_type; // static_assert(std::is_literal_type<tuple_type>::value, "! literal"); - static_assert(std::has_trivial_copy_constructor<tuple_type>::value, + static_assert(std::is_trivially_copy_constructible<tuple_type>::value, "! triv copy"); static_assert(std::is_trivially_destructible<tuple_type>::value, "! triv destructor"); diff --git a/libstdc++-v3/testsuite/util/testsuite_common_types.h b/libstdc++-v3/testsuite/util/testsuite_common_types.h index bb3d99a..a5491e2 100644 --- a/libstdc++-v3/testsuite/util/testsuite_common_types.h +++ b/libstdc++-v3/testsuite/util/testsuite_common_types.h @@ -545,7 +545,7 @@ namespace __gnu_test { void __constraint() { - typedef std::has_trivial_default_constructor<_Tp> ctor_p; + typedef std::is_trivially_default_constructible<_Tp> ctor_p; static_assert(ctor_p::value, "default constructor not trivial"); typedef std::is_trivially_destructible<_Tp> dtor_p; |