From 7a8772f6ddfc141d3b978ea053f23ccea89365e7 Mon Sep 17 00:00:00 2001 From: paolo Date: Thu, 2 Oct 2014 12:38:41 +0000 Subject: [PATCH] 2014-10-02 Edward Smith-Rowland <3dw4rd@verizon.net> * include/bits/stl_function.h: Generic associative lookup feature is not supported. * testsuite/experimental/feat-lib-fund.cc: is actually available. * testsuite/experimental/feat-cxx14.cc: Add test for __cpp_lib_is_final. * testsuite/20_util/declval/requirements/1_neg.cc: Adjust. * testsuite/20_util/duration/literals/range.cc: Adjust. * testsuite/20_util/duration/requirements/typedefs_neg1.cc: Adjust. * testsuite/20_util/duration/requirements/typedefs_neg2.cc: Adjust. * testsuite/20_util/duration/requirements/typedefs_neg3.cc: Adjust. * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Adjust. * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Adjust. * testsuite/23_containers/array/tuple_interface/get_neg.cc: Adjust. * testsuite/23_containers/array/tuple_interface/tuple_element_neg.cc: Adjust. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@215801 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 18 ++++++++++++++++++ libstdc++-v3/include/bits/stl_function.h | 2 +- .../testsuite/20_util/declval/requirements/1_neg.cc | 2 +- .../testsuite/20_util/duration/literals/range.cc | 2 +- .../20_util/duration/requirements/typedefs_neg1.cc | 2 +- .../20_util/duration/requirements/typedefs_neg2.cc | 2 +- .../20_util/duration/requirements/typedefs_neg3.cc | 2 +- .../20_util/make_signed/requirements/typedefs_neg.cc | 4 ++-- .../20_util/make_unsigned/requirements/typedefs_neg.cc | 4 ++-- .../23_containers/array/tuple_interface/get_neg.cc | 6 +++--- .../array/tuple_interface/tuple_element_neg.cc | 2 +- libstdc++-v3/testsuite/experimental/feat-cxx14.cc | 16 +++++++++++----- libstdc++-v3/testsuite/experimental/feat-lib-fund.cc | 6 +++--- 13 files changed, 46 insertions(+), 22 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 54f00ac343f..fe2c2e5e444 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,21 @@ +2014-10-02 Edward Smith-Rowland <3dw4rd@verizon.net> + + * include/bits/stl_function.h: Generic associative lookup feature + is not supported. + * testsuite/experimental/feat-lib-fund.cc: is + actually available. + * testsuite/experimental/feat-cxx14.cc: Add test for __cpp_lib_is_final. + * testsuite/20_util/declval/requirements/1_neg.cc: Adjust. + * testsuite/20_util/duration/literals/range.cc: Adjust. + * testsuite/20_util/duration/requirements/typedefs_neg1.cc: Adjust. + * testsuite/20_util/duration/requirements/typedefs_neg2.cc: Adjust. + * testsuite/20_util/duration/requirements/typedefs_neg3.cc: Adjust. + * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Adjust. + * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Adjust. + * testsuite/23_containers/array/tuple_interface/get_neg.cc: Adjust. + * testsuite/23_containers/array/tuple_interface/tuple_element_neg.cc: + Adjust. + 2014-10-01 François Dumont * python/libstdcxx/v6/printers.py (StdDebugIteratorPrinter.to_string): diff --git a/libstdc++-v3/include/bits/stl_function.h b/libstdc++-v3/include/bits/stl_function.h index 48f9bde78c5..71215b879e5 100644 --- a/libstdc++-v3/include/bits/stl_function.h +++ b/libstdc++-v3/include/bits/stl_function.h @@ -219,7 +219,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __cplusplus > 201103L #define __cpp_lib_transparent_operators 201210 -#define __cpp_lib_generic_associative_lookup 201304 +//#define __cpp_lib_generic_associative_lookup 201304 template<> struct plus 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 3710020614d..2d03f4f68db 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 // . -// { dg-error "static assertion failed" "" { target *-*-* } 2088 } +// { dg-error "static assertion failed" "" { target *-*-* } 2099 } #include diff --git a/libstdc++-v3/testsuite/20_util/duration/literals/range.cc b/libstdc++-v3/testsuite/20_util/duration/literals/range.cc index 9a897bc4ebe..556781523a6 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::max() == 9223372036854775807; auto h = 9223372036854775808h; - // { dg-error "cannot be represented" "" { target *-*-* } 799 } + // { dg-error "cannot be represented" "" { target *-*-* } 796 } } 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 a91eca47c7d..774885a2da6 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 *-*-* } 249 } +// { dg-error "rep cannot be a duration" "" { target *-*-* } 246 } // { 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 b712ed4a64a..3ffaf40fda5 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 *-*-* } 250 } +// { dg-error "must be a specialization of ratio" "" { target *-*-* } 247 } // { 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 a25e0da5a91..7c9d127a15f 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 *-*-* } 252 } +// { dg-error "period must be positive" "" { target *-*-* } 249 } // { 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 9a3ea8bf799..eaad899b05f 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 *-*-* } 1753 } -// { dg-error "declaration of" "" { target *-*-* } 1717 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1764 } +// { dg-error "declaration of" "" { target *-*-* } 1728 } 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 8539e7a7223..40811a858b7 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 *-*-* } 1656 } -// { dg-error "declaration of" "" { target *-*-* } 1620 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 1667 } +// { dg-error "declaration of" "" { target *-*-* } 1631 } diff --git a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/get_neg.cc b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/get_neg.cc index 9a3a2458647..979d7f6b5aa 100644 --- a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/get_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/get_neg.cc @@ -28,6 +28,6 @@ int n1 = std::get<1>(a); int n2 = std::get<1>(std::move(a)); int n3 = std::get<1>(ca); -// { dg-error "static assertion failed" "" { target *-*-* } 277 } -// { dg-error "static assertion failed" "" { target *-*-* } 286 } -// { dg-error "static assertion failed" "" { target *-*-* } 294 } +// { dg-error "static assertion failed" "" { target *-*-* } 274 } +// { dg-error "static assertion failed" "" { target *-*-* } 283 } +// { dg-error "static assertion failed" "" { target *-*-* } 291 } diff --git a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_neg.cc b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_neg.cc index 6aff5024317..4b1e5aeb661 100644 --- a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_neg.cc @@ -23,4 +23,4 @@ typedef std::tuple_element<1, std::array>::type type; -// { dg-error "static assertion failed" "" { target *-*-* } 325 } +// { dg-error "static assertion failed" "" { target *-*-* } 322 } diff --git a/libstdc++-v3/testsuite/experimental/feat-cxx14.cc b/libstdc++-v3/testsuite/experimental/feat-cxx14.cc index b97ecc58f99..1c590dd841b 100644 --- a/libstdc++-v3/testsuite/experimental/feat-cxx14.cc +++ b/libstdc++-v3/testsuite/experimental/feat-cxx14.cc @@ -78,11 +78,11 @@ # error "__cpp_lib_complex_udls != 201309" #endif -#ifndef __cpp_lib_generic_associative_lookup -# error "__cpp_lib_generic_associative_lookup" -#elif __cpp_lib_generic_associative_lookup != 201304 -# error "__cpp_lib_generic_associative_lookup != 201304" -#endif +//#ifndef __cpp_lib_generic_associative_lookup +//# error "__cpp_lib_generic_associative_lookup" +//#elif __cpp_lib_generic_associative_lookup != 201304 +//# error "__cpp_lib_generic_associative_lookup != 201304" +//#endif //#ifndef __cpp_lib_null_iterators //# error "__cpp_lib_null_iterators" @@ -111,3 +111,9 @@ #elif __cpp_lib_shared_timed_mutex != 201402 # error "__cpp_lib_shared_timed_mutex != 201402" #endif + +#ifndef __cpp_lib_is_final +# error "__cpp_lib_is_final" +#elif __cpp_lib_is_final != 201402 +# error "__cpp_lib_is_final != 201402" +#endif diff --git a/libstdc++-v3/testsuite/experimental/feat-lib-fund.cc b/libstdc++-v3/testsuite/experimental/feat-lib-fund.cc index ac8560dfb42..50d1ce247f0 100644 --- a/libstdc++-v3/testsuite/experimental/feat-lib-fund.cc +++ b/libstdc++-v3/testsuite/experimental/feat-lib-fund.cc @@ -12,9 +12,9 @@ //# error "" //#endif -//#if !__has_include() -//# error "" -//#endif +#if !__has_include() +# error "" +#endif //#if !__has_include() //# error "" -- 2.11.4.GIT