From: Jonathan Wakely Date: Mon, 22 Oct 2018 08:47:52 +0000 (+0100) Subject: PR libstdc++/79433 no #error for including TS headers with wrong -std X-Git-Tag: releases/gcc-7.4.0~85 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=268ab32f4ad62bd9c85975e11dadb89893b2f742;p=thirdparty%2Fgcc.git PR libstdc++/79433 no #error for including TS headers with wrong -std Backport from mainline 2017-09-12 Jonathan Wakely PR libstdc++/79433 * include/Makefile.am: Remove . * include/Makefile.in: Regenerate. * include/bits/c++14_warning.h: Remove. * include/experimental/algorithm: Do not include . * include/experimental/any: Likewise. * include/experimental/array: Likewise. * include/experimental/bits/erase_if.h: Likewise. * include/experimental/bits/lfts_config.h: Likewise. * include/experimental/bits/shared_ptr.h: Likewise. * include/experimental/bits/string_view.tcc: Likewise. * include/experimental/chrono: Likewise. * include/experimental/deque: Likewise. * include/experimental/filesystem: Do not include . * include/experimental/forward_list: Do not include . * include/experimental/functional: Likewise. * include/experimental/iterator: Likewise. * include/experimental/list: Likewise. * include/experimental/map: Likewise. * include/experimental/memory: Likewise. * include/experimental/numeric: Likewise. * include/experimental/optional: Likewise. * include/experimental/propagate_const: Likewise. * include/experimental/ratio: Likewise. * include/experimental/regex: Likewise. * include/experimental/set: Likewise. * include/experimental/string: Likewise. * include/experimental/string_view: Likewise. * include/experimental/system_error: Likewise. * include/experimental/tuple: Likewise. * include/experimental/type_traits: Likewise. * include/experimental/unordered_map: Likewise. * include/experimental/unordered_set: Likewise. * include/experimental/vector: Likewise. * testsuite/experimental/any/misc/any_cast_neg.cc: Adjust dg-error line number. * testsuite/experimental/array/neg.cc: Likewise. * testsuite/experimental/propagate_const/assignment/move_neg.cc: Likewise. * testsuite/experimental/propagate_const/cons/move_neg.cc: Likewise. * testsuite/experimental/propagate_const/requirements2.cc: Likewise. * testsuite/experimental/propagate_const/requirements3.cc: Likewise. * testsuite/experimental/propagate_const/requirements4.cc: Likewise. * testsuite/experimental/propagate_const/requirements5.cc: Likewise. From-SVN: r265374 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c0b73cd60586..68e4f1e3ed47 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,53 @@ +2018-10-22 Jonathan Wakely + + Backport from mainline + 2017-09-12 Jonathan Wakely + + PR libstdc++/79433 + * include/Makefile.am: Remove . + * include/Makefile.in: Regenerate. + * include/bits/c++14_warning.h: Remove. + * include/experimental/algorithm: Do not include . + * include/experimental/any: Likewise. + * include/experimental/array: Likewise. + * include/experimental/bits/erase_if.h: Likewise. + * include/experimental/bits/lfts_config.h: Likewise. + * include/experimental/bits/shared_ptr.h: Likewise. + * include/experimental/bits/string_view.tcc: Likewise. + * include/experimental/chrono: Likewise. + * include/experimental/deque: Likewise. + * include/experimental/filesystem: Do not include . + * include/experimental/forward_list: Do not include . + * include/experimental/functional: Likewise. + * include/experimental/iterator: Likewise. + * include/experimental/list: Likewise. + * include/experimental/map: Likewise. + * include/experimental/memory: Likewise. + * include/experimental/numeric: Likewise. + * include/experimental/optional: Likewise. + * include/experimental/propagate_const: Likewise. + * include/experimental/ratio: Likewise. + * include/experimental/regex: Likewise. + * include/experimental/set: Likewise. + * include/experimental/string: Likewise. + * include/experimental/string_view: Likewise. + * include/experimental/system_error: Likewise. + * include/experimental/tuple: Likewise. + * include/experimental/type_traits: Likewise. + * include/experimental/unordered_map: Likewise. + * include/experimental/unordered_set: Likewise. + * include/experimental/vector: Likewise. + * testsuite/experimental/any/misc/any_cast_neg.cc: Adjust dg-error + line number. + * testsuite/experimental/array/neg.cc: Likewise. + * testsuite/experimental/propagate_const/assignment/move_neg.cc: + Likewise. + * testsuite/experimental/propagate_const/cons/move_neg.cc: Likewise. + * testsuite/experimental/propagate_const/requirements2.cc: Likewise. + * testsuite/experimental/propagate_const/requirements3.cc: Likewise. + * testsuite/experimental/propagate_const/requirements4.cc: Likewise. + * testsuite/experimental/propagate_const/requirements5.cc: Likewise. + 2018-10-18 Jonathan Wakely Backport from mainline diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 85b22a606d54..500a9aa7bb90 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -95,7 +95,6 @@ bits_headers = \ ${bits_srcdir}/basic_string.tcc \ ${bits_srcdir}/boost_concept_check.h \ ${bits_srcdir}/c++0x_warning.h \ - ${bits_srcdir}/c++14_warning.h \ ${bits_srcdir}/char_traits.h \ ${bits_srcdir}/codecvt.h \ ${bits_srcdir}/concept_check.h \ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index d940fcbdf84a..cc571a417ea7 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -388,7 +388,6 @@ bits_headers = \ ${bits_srcdir}/basic_string.tcc \ ${bits_srcdir}/boost_concept_check.h \ ${bits_srcdir}/c++0x_warning.h \ - ${bits_srcdir}/c++14_warning.h \ ${bits_srcdir}/char_traits.h \ ${bits_srcdir}/codecvt.h \ ${bits_srcdir}/concept_check.h \ diff --git a/libstdc++-v3/include/bits/c++14_warning.h b/libstdc++-v3/include/bits/c++14_warning.h deleted file mode 100644 index 5ead9c6b122a..000000000000 --- a/libstdc++-v3/include/bits/c++14_warning.h +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (C) 2013-2017 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. - -// Under Section 7 of GPL version 3, you are granted additional -// permissions described in the GCC Runtime Library Exception, version -// 3.1, as published by the Free Software Foundation. - -// You should have received a copy of the GNU General Public License and -// a copy of the GCC Runtime Library Exception along with this program; -// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -// . - -/** @file bits/c++14_warning.h - * This is an internal header file, included by other library headers. - * Do not attempt to use it directly. @headername{iosfwd} - */ - -#ifndef _CXX14_WARNING_H -#define _CXX14_WARNING_H 1 - -#if __cplusplus <= 201103L -#error This file requires compiler and library support \ -for the ISO C++ 2014 standard. This support must be enabled \ -with the -std=c++14 or -std=gnu++14 compiler options. -#endif - -#endif diff --git a/libstdc++-v3/include/experimental/algorithm b/libstdc++-v3/include/experimental/algorithm index a7ab0e84c12d..f7c9fbe0229f 100644 --- a/libstdc++-v3/include/experimental/algorithm +++ b/libstdc++-v3/include/experimental/algorithm @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/any b/libstdc++-v3/include/experimental/any index 36c0680c25a6..b1d11398b793 100644 --- a/libstdc++-v3/include/experimental/any +++ b/libstdc++-v3/include/experimental/any @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/array b/libstdc++-v3/include/experimental/array index 11cb924e087b..09751a4204cc 100644 --- a/libstdc++-v3/include/experimental/array +++ b/libstdc++-v3/include/experimental/array @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/bits/erase_if.h b/libstdc++-v3/include/experimental/bits/erase_if.h index 7dc47dbb3ebc..2a5a520539a9 100644 --- a/libstdc++-v3/include/experimental/bits/erase_if.h +++ b/libstdc++-v3/include/experimental/bits/erase_if.h @@ -32,9 +32,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include namespace std diff --git a/libstdc++-v3/include/experimental/bits/lfts_config.h b/libstdc++-v3/include/experimental/bits/lfts_config.h index a9faa47a842f..cef3dc6d8eff 100644 --- a/libstdc++-v3/include/experimental/bits/lfts_config.h +++ b/libstdc++-v3/include/experimental/bits/lfts_config.h @@ -27,9 +27,7 @@ * Do not attempt to use it directly. */ -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #if _GLIBCXX_INLINE_VERSION diff --git a/libstdc++-v3/include/experimental/bits/shared_ptr.h b/libstdc++-v3/include/experimental/bits/shared_ptr.h index 27f22d236181..bbeccd9b0101 100644 --- a/libstdc++-v3/include/experimental/bits/shared_ptr.h +++ b/libstdc++-v3/include/experimental/bits/shared_ptr.h @@ -32,9 +32,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/bits/string_view.tcc b/libstdc++-v3/include/experimental/bits/string_view.tcc index 30968fc6b838..ea0a49c1b035 100644 --- a/libstdc++-v3/include/experimental/bits/string_view.tcc +++ b/libstdc++-v3/include/experimental/bits/string_view.tcc @@ -36,9 +36,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/experimental/chrono b/libstdc++-v3/include/experimental/chrono index 4247c9df746e..d8b6b3305765 100644 --- a/libstdc++-v3/include/experimental/chrono +++ b/libstdc++-v3/include/experimental/chrono @@ -35,9 +35,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/deque b/libstdc++-v3/include/experimental/deque index c92476f915d2..5900648b8aba 100644 --- a/libstdc++-v3/include/experimental/deque +++ b/libstdc++-v3/include/experimental/deque @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/filesystem b/libstdc++-v3/include/experimental/filesystem index 2f353693dbe6..0c8d5b023626 100644 --- a/libstdc++-v3/include/experimental/filesystem +++ b/libstdc++-v3/include/experimental/filesystem @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus < 201103L -# include -#else +#if __cplusplus >= 201103L #include #include diff --git a/libstdc++-v3/include/experimental/forward_list b/libstdc++-v3/include/experimental/forward_list index 1c835aca07ef..f95ca40f9fd1 100644 --- a/libstdc++-v3/include/experimental/forward_list +++ b/libstdc++-v3/include/experimental/forward_list @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/functional b/libstdc++-v3/include/experimental/functional index 4639e6f6cb3c..96ecd0645194 100644 --- a/libstdc++-v3/include/experimental/functional +++ b/libstdc++-v3/include/experimental/functional @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/iterator b/libstdc++-v3/include/experimental/iterator index 8a8395da759c..487b27226ceb 100644 --- a/libstdc++-v3/include/experimental/iterator +++ b/libstdc++-v3/include/experimental/iterator @@ -35,9 +35,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/list b/libstdc++-v3/include/experimental/list index 9409431c4d8b..abde37896ab9 100644 --- a/libstdc++-v3/include/experimental/list +++ b/libstdc++-v3/include/experimental/list @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/map b/libstdc++-v3/include/experimental/map index 2bbc1bd5a11c..77887457cd1d 100644 --- a/libstdc++-v3/include/experimental/map +++ b/libstdc++-v3/include/experimental/map @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/memory b/libstdc++-v3/include/experimental/memory index 7467674db81d..56d56ac01044 100644 --- a/libstdc++-v3/include/experimental/memory +++ b/libstdc++-v3/include/experimental/memory @@ -35,9 +35,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/numeric b/libstdc++-v3/include/experimental/numeric index b7b8207069f7..c63bd90765d4 100644 --- a/libstdc++-v3/include/experimental/numeric +++ b/libstdc++-v3/include/experimental/numeric @@ -35,9 +35,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/optional b/libstdc++-v3/include/experimental/optional index 197a1fc76912..12b9599f1d88 100644 --- a/libstdc++-v3/include/experimental/optional +++ b/libstdc++-v3/include/experimental/optional @@ -41,9 +41,7 @@ * between different GCC releases for these features. */ -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/propagate_const b/libstdc++-v3/include/experimental/propagate_const index 719e17aa3d0c..ed9e8eb3dd88 100644 --- a/libstdc++-v3/include/experimental/propagate_const +++ b/libstdc++-v3/include/experimental/propagate_const @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/ratio b/libstdc++-v3/include/experimental/ratio index ffbae76ca796..708eb7af1f1f 100644 --- a/libstdc++-v3/include/experimental/ratio +++ b/libstdc++-v3/include/experimental/ratio @@ -35,9 +35,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/regex b/libstdc++-v3/include/experimental/regex index f0b0dfacfe90..ba4d02cc69a1 100644 --- a/libstdc++-v3/include/experimental/regex +++ b/libstdc++-v3/include/experimental/regex @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/set b/libstdc++-v3/include/experimental/set index a10617bb2a9e..87d6aa65a47e 100644 --- a/libstdc++-v3/include/experimental/set +++ b/libstdc++-v3/include/experimental/set @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/string b/libstdc++-v3/include/experimental/string index ff3777c31e2b..9e92270c79dc 100644 --- a/libstdc++-v3/include/experimental/string +++ b/libstdc++-v3/include/experimental/string @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/string_view b/libstdc++-v3/include/experimental/string_view index 2235a51ea5de..cdc23d17a7a6 100644 --- a/libstdc++-v3/include/experimental/string_view +++ b/libstdc++-v3/include/experimental/string_view @@ -35,9 +35,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/system_error b/libstdc++-v3/include/experimental/system_error index 2b4855dba72f..085b43b7f6ac 100644 --- a/libstdc++-v3/include/experimental/system_error +++ b/libstdc++-v3/include/experimental/system_error @@ -35,9 +35,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/tuple b/libstdc++-v3/include/experimental/tuple index 879636eecd8d..13d7bf7bd2a5 100644 --- a/libstdc++-v3/include/experimental/tuple +++ b/libstdc++-v3/include/experimental/tuple @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/type_traits b/libstdc++-v3/include/experimental/type_traits index 7ec06308ba96..605a92e86fec 100644 --- a/libstdc++-v3/include/experimental/type_traits +++ b/libstdc++-v3/include/experimental/type_traits @@ -35,9 +35,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/unordered_map b/libstdc++-v3/include/experimental/unordered_map index fbc44b267b52..8b640a2ad4f1 100644 --- a/libstdc++-v3/include/experimental/unordered_map +++ b/libstdc++-v3/include/experimental/unordered_map @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/unordered_set b/libstdc++-v3/include/experimental/unordered_set index 3c8fe255275f..1d78c52d446f 100644 --- a/libstdc++-v3/include/experimental/unordered_set +++ b/libstdc++-v3/include/experimental/unordered_set @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/include/experimental/vector b/libstdc++-v3/include/experimental/vector index b75a3bc7ce43..5d007a22c64f 100644 --- a/libstdc++-v3/include/experimental/vector +++ b/libstdc++-v3/include/experimental/vector @@ -31,9 +31,7 @@ #pragma GCC system_header -#if __cplusplus <= 201103L -# include -#else +#if __cplusplus >= 201402L #include #include diff --git a/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc b/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc index 697b0f03e2b1..81eda331fc87 100644 --- a/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc +++ b/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc @@ -25,5 +25,5 @@ void test01() using std::experimental::any_cast; const any y(1); - any_cast(y); // { dg-error "qualifiers" "" { target { *-*-* } } 359 } + any_cast(y); // { dg-error "qualifiers" "" { target { *-*-* } } 357 } } diff --git a/libstdc++-v3/testsuite/experimental/array/neg.cc b/libstdc++-v3/testsuite/experimental/array/neg.cc index 3963287f2575..e531678122a7 100644 --- a/libstdc++-v3/testsuite/experimental/array/neg.cc +++ b/libstdc++-v3/testsuite/experimental/array/neg.cc @@ -24,5 +24,5 @@ int main() { int dummy; auto bad = std::experimental::make_array(std::ref(dummy)); - // { dg-error "explicit target type" "" { target *-*-* } 78 } + // { dg-error "explicit target type" "" { target *-*-* } 76 } } diff --git a/libstdc++-v3/testsuite/experimental/propagate_const/assignment/move_neg.cc b/libstdc++-v3/testsuite/experimental/propagate_const/assignment/move_neg.cc index 040e30b81a2b..a0cc0e9f4342 100644 --- a/libstdc++-v3/testsuite/experimental/propagate_const/assignment/move_neg.cc +++ b/libstdc++-v3/testsuite/experimental/propagate_const/assignment/move_neg.cc @@ -25,7 +25,7 @@ using std::experimental::propagate_const; using std::unique_ptr; -// { dg-error "no type" "" { target *-*-* } 162 } +// { dg-error "no type" "" { target *-*-* } 160 } int main() { diff --git a/libstdc++-v3/testsuite/experimental/propagate_const/cons/move_neg.cc b/libstdc++-v3/testsuite/experimental/propagate_const/cons/move_neg.cc index 743658f5f9e1..ac71a29cf56c 100644 --- a/libstdc++-v3/testsuite/experimental/propagate_const/cons/move_neg.cc +++ b/libstdc++-v3/testsuite/experimental/propagate_const/cons/move_neg.cc @@ -25,10 +25,10 @@ using std::experimental::propagate_const; using std::unique_ptr; -// { dg-error "no type" "" { target *-*-* } 120 } -// { dg-error "no type" "" { target *-*-* } 127 } -// { dg-error "no type" "" { target *-*-* } 136 } -// { dg-error "no type" "" { target *-*-* } 145 } +// { dg-error "no type" "" { target *-*-* } 118 } +// { dg-error "no type" "" { target *-*-* } 125 } +// { dg-error "no type" "" { target *-*-* } 134 } +// { dg-error "no type" "" { target *-*-* } 143 } int main() { diff --git a/libstdc++-v3/testsuite/experimental/propagate_const/requirements2.cc b/libstdc++-v3/testsuite/experimental/propagate_const/requirements2.cc index 6f8fef80aca8..626805ecd46c 100644 --- a/libstdc++-v3/testsuite/experimental/propagate_const/requirements2.cc +++ b/libstdc++-v3/testsuite/experimental/propagate_const/requirements2.cc @@ -21,9 +21,9 @@ using std::experimental::propagate_const; -// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 107 } -// { dg-error "not a pointer-to-object type" "" { target *-*-* } 68 } -// { dg-error "forming pointer to reference type" "" { target *-*-* } 189 } -// { dg-error "forming pointer to reference type" "" { target *-*-* } 215 } +// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 105 } +// { dg-error "not a pointer-to-object type" "" { target *-*-* } 66 } +// { dg-error "forming pointer to reference type" "" { target *-*-* } 187 } +// { dg-error "forming pointer to reference type" "" { target *-*-* } 213 } propagate_const test1; diff --git a/libstdc++-v3/testsuite/experimental/propagate_const/requirements3.cc b/libstdc++-v3/testsuite/experimental/propagate_const/requirements3.cc index 0498b0bafa42..74ed5d35c4ea 100644 --- a/libstdc++-v3/testsuite/experimental/propagate_const/requirements3.cc +++ b/libstdc++-v3/testsuite/experimental/propagate_const/requirements3.cc @@ -21,6 +21,6 @@ using std::experimental::propagate_const; -// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 107 } +// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 105 } propagate_const test1; diff --git a/libstdc++-v3/testsuite/experimental/propagate_const/requirements4.cc b/libstdc++-v3/testsuite/experimental/propagate_const/requirements4.cc index d662af82fee1..4182c0862f39 100644 --- a/libstdc++-v3/testsuite/experimental/propagate_const/requirements4.cc +++ b/libstdc++-v3/testsuite/experimental/propagate_const/requirements4.cc @@ -21,8 +21,8 @@ using std::experimental::propagate_const; -// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 107 } -// { dg-error "invalid type" "" { target *-*-* } 68 } -// { dg-error "uninitialized reference member" "" { target *-*-* } 114 } +// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 105 } +// { dg-error "invalid type" "" { target *-*-* } 66 } +// { dg-error "uninitialized reference member" "" { target *-*-* } 112 } propagate_const test1; // { dg-error "use of deleted function" } diff --git a/libstdc++-v3/testsuite/experimental/propagate_const/requirements5.cc b/libstdc++-v3/testsuite/experimental/propagate_const/requirements5.cc index adf0809858ac..07a4c69c1479 100644 --- a/libstdc++-v3/testsuite/experimental/propagate_const/requirements5.cc +++ b/libstdc++-v3/testsuite/experimental/propagate_const/requirements5.cc @@ -21,6 +21,6 @@ using std::experimental::propagate_const; -// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 107 } +// { dg-error "requires a class or a pointer to an object type" "" { target *-*-* } 105 } propagate_const test1;