From 97e3ad20b12a5a317d98085df6f18a87f681f377 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 31 Oct 2011 15:34:14 -0400 Subject: [PATCH] re PR c++/50920 (add a -std=c++11 option to the driver) PR c++/50920 gcc/c-family * c-common.h (cxx_dialect): Add cxx11 and cxx03. * c.opt: Add -std=c++11, -std=gnu++11, -std=gnu++03, and -Wc++11-compat. * c-opts.c (set_std_cxx11): Rename from set_std_cxx0x. gcc/cp * class.c (check_field_decl): Change c++0x in diags to c++11. * error.c (maybe_warn_cpp0x): Likewise. * parser.c (cp_parser_diagnose_invalid_type_name): Likewise. * pt.c (check_default_tmpl_args): Likewise. libcpp * include/cpplib.h (enum c_lang): Rename CLK_CXX0X to CLK_CXX11, CLK_GNUCXX0X to CLK_GNUCXX11. libstdc++-v3 * include/bits/c++0x_warning.h: Change -std=c++0x to -std=c++11. From-SVN: r180707 --- gcc/c-family/ChangeLog | 8 +++++ gcc/c-family/c-common.h | 9 ++--- gcc/c-family/c-opts.c | 18 +++++----- gcc/c-family/c.opt | 36 ++++++++++++------- gcc/cp/ChangeLog | 8 +++++ gcc/cp/class.c | 2 +- gcc/cp/error.c | 22 ++++++------ gcc/cp/parser.c | 4 +-- gcc/cp/pt.c | 2 +- gcc/testsuite/g++.dg/cpp0x/constexpr-98.C | 2 +- libcpp/ChangeLog | 6 ++++ libcpp/include/cpplib.h | 2 +- libcpp/init.c | 8 ++--- libstdc++-v3/ChangeLog | 5 +++ libstdc++-v3/include/bits/c++0x_warning.h | 6 ++-- .../headers/cstdbool/std_c++0x_neg.cc | 2 +- .../headers/cstdint/std_c++0x_neg.cc | 2 +- .../headers/system_error/std_c++0x_neg.cc | 2 +- .../headers/type_traits/std_c++0x_neg.cc | 2 +- .../headers/array/std_c++0x_neg.cc | 2 +- .../headers/tuple/std_c++0x_neg.cc | 2 +- .../headers/unordered_map/std_c++0x_neg.cc | 2 +- .../headers/unordered_set/std_c++0x_neg.cc | 2 +- .../headers/ccomplex/std_c++0x_neg.cc | 2 +- .../headers/cfenv/std_c++0x_neg.cc | 2 +- .../headers/ctgmath/std_c++0x_neg.cc | 2 +- .../headers/random/std_c++0x_neg.cc | 2 +- .../27_io/headers/cinttypes/std_c++0x_neg.cc | 2 +- .../28_regex/headers/regex/std_c++0x_neg.cc | 2 +- .../headers/atomic/std_c++0x_neg.cc | 2 +- .../condition_variable/std_c++0x_neg.cc | 2 +- .../headers/future/std_c++0x_neg.cc | 2 +- .../30_threads/headers/mutex/std_c++0x_neg.cc | 2 +- .../headers/thread/std_c++0x_neg.cc | 2 +- 34 files changed, 108 insertions(+), 68 deletions(-) diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 02e823f6548..d77004eb794 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,11 @@ +2011-10-31 Jason Merrill + + PR c++/50920 + * c-common.h (cxx_dialect): Add cxx11 and cxx03. + * c.opt: Add -std=c++11, -std=gnu++11, -std=gnu++03, + and -Wc++11-compat. + * c-opts.c (set_std_cxx11): Rename from set_std_cxx0x. + 2011-10-27 Roberto Agostino Vitillo PR c++/30066 diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h index be9d7295b2a..71746a949d3 100644 --- a/gcc/c-family/c-common.h +++ b/gcc/c-family/c-common.h @@ -643,11 +643,12 @@ extern int flag_use_repository; /* The supported C++ dialects. */ enum cxx_dialect { - /* C++98 */ + /* C++98 with TC1 */ cxx98, - /* Experimental features that are likely to become part of - C++0x. */ - cxx0x + cxx03 = cxx98, + /* C++11 */ + cxx0x, + cxx11 = cxx0x }; /* The C++ dialect being used. C++98 is the default. */ diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c index 6869d5c35ef..b56aec79906 100644 --- a/gcc/c-family/c-opts.c +++ b/gcc/c-family/c-opts.c @@ -110,7 +110,7 @@ static size_t include_cursor; static void handle_OPT_d (const char *); static void set_std_cxx98 (int); -static void set_std_cxx0x (int); +static void set_std_cxx11 (int); static void set_std_c89 (int, int); static void set_std_c99 (int); static void set_std_c1x (int); @@ -775,10 +775,10 @@ c_common_handle_option (size_t scode, const char *arg, int value, set_std_cxx98 (code == OPT_std_c__98 /* ISO */); break; - case OPT_std_c__0x: - case OPT_std_gnu__0x: + case OPT_std_c__11: + case OPT_std_gnu__11: if (!preprocessing_asm_p) - set_std_cxx0x (code == OPT_std_c__0x /* ISO */); + set_std_cxx11 (code == OPT_std_c__11 /* ISO */); break; case OPT_std_c90: @@ -1501,18 +1501,18 @@ set_std_cxx98 (int iso) cxx_dialect = cxx98; } -/* Set the C++ 0x working draft "standard" (without GNU extensions if ISO). */ +/* Set the C++ 2011 standard (without GNU extensions if ISO). */ static void -set_std_cxx0x (int iso) +set_std_cxx11 (int iso) { - cpp_set_lang (parse_in, iso ? CLK_CXX0X: CLK_GNUCXX0X); + cpp_set_lang (parse_in, iso ? CLK_CXX11: CLK_GNUCXX11); flag_no_gnu_keywords = iso; flag_no_nonansi_builtin = iso; flag_iso = iso; - /* C++0x includes the C99 standard library. */ + /* C++11 includes the C99 standard library. */ flag_isoc94 = 1; flag_isoc99 = 1; - cxx_dialect = cxx0x; + cxx_dialect = cxx11; } /* Args to -d specify what to dump. Silently ignore diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt index 693f1914c8c..336a75aa7b8 100644 --- a/gcc/c-family/c.opt +++ b/gcc/c-family/c.opt @@ -289,7 +289,11 @@ Warn about C constructs that are not in the common subset of C and C++ Wc++0x-compat C++ ObjC++ Var(warn_cxx0x_compat) Warning -Warn about C++ constructs whose meaning differs between ISO C++ 1998 and ISO C++ 200x +Deprecated in favor of -Wc++11-compat + +Wc++11-compat +C++ ObjC++ Warning Alias(Wc++0x-compat) +Warn about C++ constructs whose meaning differs between ISO C++ 1998 and ISO C++ 2011 Wcast-qual C ObjC C++ ObjC++ Var(warn_cast_qual) Warning @@ -1175,12 +1179,13 @@ std=c++03 C++ ObjC++ Alias(std=c++98) Conform to the ISO 1998 C++ standard revised by the 2003 technical corrigendum -std=c++0x +std=c++11 C++ ObjC++ -Conform to the ISO 1998 C++ standard, with extensions that are likely to -become a part of the upcoming ISO C++ standard, dubbed C++0x. Note that the -extensions enabled by this mode are experimental and may be removed in -future releases of GCC. +Conform to the ISO 2011 C++ standard (experimental and incomplete support) + +std=c++0x +C++ ObjC++ Alias(std=c++11) +Deprecated in favor of -std=c++11 std=c1x C ObjC @@ -1204,14 +1209,21 @@ Deprecated in favor of -std=c99 std=gnu++98 C++ ObjC++ -Conform to the ISO 1998 C++ standard with GNU extensions +Conform to the ISO 1998 C++ standard revised by the 2003 technical +corrigendum with GNU extensions -std=gnu++0x +std=gnu++03 +C++ ObjC++ Alias(std=gnu++98) +Conform to the ISO 1998 C++ standard revised by the 2003 technical +corrigendum with GNU extensions + +std=gnu++11 C++ ObjC++ -Conform to the ISO 1998 C++ standard, with GNU extensions and -extensions that are likely to become a part of the upcoming ISO C++ -standard, dubbed C++0x. Note that the extensions enabled by this mode -are experimental and may be removed in future releases of GCC. +Conform to the ISO 2011 C++ standard with GNU extensions (experimental and incomplete support) + +std=gnu++0x +C++ ObjC++ Alias(std=gnu++11) +Deprecated in favor of -std=gnu++11 std=gnu1x C ObjC diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 226c4198d0b..dbf2dd7a8ba 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2011-10-31 Jason Merrill + + PR c++/50920 + * class.c (check_field_decl): Change c++0x in diags to c++11. + * error.c (maybe_warn_cpp0x): Likewise. + * parser.c (cp_parser_diagnose_invalid_type_name): Likewise. + * pt.c (check_default_tmpl_args): Likewise. + 2011-10-31 Diego Novillo * mangle.c (get_mangled_id): Factor from ... diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 03521e50345..a014d251409 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -2924,7 +2924,7 @@ check_field_decl (tree field, if (!warned && errorcount > oldcount) { inform (DECL_SOURCE_LOCATION (field), "unrestricted unions " - "only available with -std=c++0x or -std=gnu++0x"); + "only available with -std=c++11 or -std=gnu++11"); warned = true; } } diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 544c4d1b7ac..0bee6b4105c 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -3205,55 +3205,55 @@ maybe_warn_cpp0x (cpp0x_warn_str str) case CPP0X_INITIALIZER_LISTS: pedwarn (input_location, 0, "extended initializer lists " - "only available with -std=c++0x or -std=gnu++0x"); + "only available with -std=c++11 or -std=gnu++11"); break; case CPP0X_EXPLICIT_CONVERSION: pedwarn (input_location, 0, "explicit conversion operators " - "only available with -std=c++0x or -std=gnu++0x"); + "only available with -std=c++11 or -std=gnu++11"); break; case CPP0X_VARIADIC_TEMPLATES: pedwarn (input_location, 0, "variadic templates " - "only available with -std=c++0x or -std=gnu++0x"); + "only available with -std=c++11 or -std=gnu++11"); break; case CPP0X_LAMBDA_EXPR: pedwarn (input_location, 0, "lambda expressions " - "only available with -std=c++0x or -std=gnu++0x"); + "only available with -std=c++11 or -std=gnu++11"); break; case CPP0X_AUTO: pedwarn (input_location, 0, - "C++0x auto only available with -std=c++0x or -std=gnu++0x"); + "C++0x auto only available with -std=c++11 or -std=gnu++11"); break; case CPP0X_SCOPED_ENUMS: pedwarn (input_location, 0, - "scoped enums only available with -std=c++0x or -std=gnu++0x"); + "scoped enums only available with -std=c++11 or -std=gnu++11"); break; case CPP0X_DEFAULTED_DELETED: pedwarn (input_location, 0, "defaulted and deleted functions " - "only available with -std=c++0x or -std=gnu++0x"); + "only available with -std=c++11 or -std=gnu++11"); break; case CPP0X_INLINE_NAMESPACES: pedwarn (input_location, OPT_pedantic, "inline namespaces " - "only available with -std=c++0x or -std=gnu++0x"); + "only available with -std=c++11 or -std=gnu++11"); break; case CPP0X_OVERRIDE_CONTROLS: pedwarn (input_location, 0, "override controls (override/final) " - "only available with -std=c++0x or -std=gnu++0x"); + "only available with -std=c++11 or -std=gnu++11"); break; case CPP0X_NSDMI: pedwarn (input_location, 0, "non-static data member initializers " - "only available with -std=c++0x or -std=gnu++0x"); + "only available with -std=c++11 or -std=gnu++11"); break; case CPP0X_USER_DEFINED_LITERALS: pedwarn (input_location, 0, "user-defined literals " - "only available with -std=c++0x or -std=gnu++0x"); + "only available with -std=c++11 or -std=gnu++11"); break; default: gcc_unreachable (); diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 090482cbd14..63f92620886 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -2759,8 +2759,8 @@ cp_parser_diagnose_invalid_type_name (cp_parser *parser, The user should have said "typename A::X". */ if (cxx_dialect < cxx0x && id == ridpointers[(int)RID_CONSTEXPR]) - inform (location, "C++0x % only available with " - "-std=c++0x or -std=gnu++0x"); + inform (location, "C++11 % only available with " + "-std=c++11 or -std=gnu++11"); else if (processing_template_decl && current_class_type && TYPE_BINFO (current_class_type)) { diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index d0577762cbd..493e3e6bcc3 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -4650,7 +4650,7 @@ check_default_tmpl_args (tree decl, tree parms, int is_primary, "friend declarations"); else if (TREE_CODE (decl) == FUNCTION_DECL && (cxx_dialect == cxx98)) msg = G_("default template arguments may not be used in function templates " - "without -std=c++0x or -std=gnu++0x"); + "without -std=c++11 or -std=gnu++11"); else if (is_partial) msg = G_("default template arguments may not be used in " "partial specializations"); diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-98.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-98.C index 4ae3944c34d..1a0189b56e2 100644 --- a/gcc/testsuite/g++.dg/cpp0x/constexpr-98.C +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-98.C @@ -1,4 +1,4 @@ // { dg-options "-std=c++98" } -constexpr int i = 42; // { dg-message "std=c\\+\\+0x" } +constexpr int i = 42; // { dg-message "std=c\\+\\+11" } // { dg-error "constexpr" "" { target *-*-* } 3 } diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 5be923ea1f6..8013364e6be 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2011-10-31 Jason Merrill + + PR c++/50920 + * include/cpplib.h (enum c_lang): Rename CLK_CXX0X to CLK_CXX11, + CLK_GNUCXX0X to CLK_GNUCXX11. + 2011-10-26 Ed Smith-Rowland <3dw4rd@verizon.net> Implement C++11 user-defined literals. diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index 9582b621ab5..518fe945ebb 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -167,7 +167,7 @@ enum cpp_ttype /* C language kind, used when calling cpp_create_reader. */ enum c_lang {CLK_GNUC89 = 0, CLK_GNUC99, CLK_GNUC1X, CLK_STDC89, CLK_STDC94, CLK_STDC99, CLK_STDC1X, - CLK_GNUCXX, CLK_CXX98, CLK_GNUCXX0X, CLK_CXX0X, CLK_ASM}; + CLK_GNUCXX, CLK_CXX98, CLK_GNUCXX11, CLK_CXX11, CLK_ASM}; /* Payload of a NUMBER, STRING, CHAR or COMMENT token. */ struct GTY(()) cpp_string { diff --git a/libcpp/init.c b/libcpp/init.c index 99b65ba339e..bbaa8ae10c3 100644 --- a/libcpp/init.c +++ b/libcpp/init.c @@ -94,11 +94,11 @@ static const struct lang_flags lang_defaults[] = /* STDC1X */ { 1, 0, 1, 0, 1, 1, 1, 1, 0, 0 }, /* GNUCXX */ { 0, 1, 1, 0, 0, 1, 1, 0, 0, 0 }, /* CXX98 */ { 0, 1, 1, 0, 1, 1, 1, 0, 0, 0 }, - /* GNUCXX0X */ { 1, 1, 1, 0, 0, 1, 1, 1, 1, 1 }, - /* CXX0X */ { 1, 1, 1, 0, 1, 1, 1, 1, 1, 1 }, + /* GNUCXX11 */ { 1, 1, 1, 0, 0, 1, 1, 1, 1, 1 }, + /* CXX11 */ { 1, 1, 1, 0, 1, 1, 1, 1, 1, 1 }, /* ASM */ { 0, 0, 1, 0, 0, 1, 0, 0, 0, 0 } - /* xid should be 1 for GNUC99, STDC99, GNUCXX, CXX98, GNUCXX0X, and - CXX0X when no longer experimental (when all uses of identifiers + /* xid should be 1 for GNUC99, STDC99, GNUCXX, CXX98, GNUCXX11, and + CXX11 when no longer experimental (when all uses of identifiers in the compiler have been audited for correct handling of extended identifiers). */ }; diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ed8492d55d2..9f7c67d0427 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2011-10-31 Jason Merrill + + PR c++/50920 + * include/bits/c++0x_warning.h: Change -std=c++0x to -std=c++11. + 2011-10-30 Gerald Pfeifer * prerequisites.xml: Refer to GCC (instead of gcc) and GNU/Linux. diff --git a/libstdc++-v3/include/bits/c++0x_warning.h b/libstdc++-v3/include/bits/c++0x_warning.h index 0685a50e6e3..eb072d00a45 100644 --- a/libstdc++-v3/include/bits/c++0x_warning.h +++ b/libstdc++-v3/include/bits/c++0x_warning.h @@ -29,9 +29,9 @@ #define _CXX0X_WARNING_H 1 #ifndef __GXX_EXPERIMENTAL_CXX0X__ -#error This file requires compiler and library support for the upcoming \ -ISO C++ standard, C++0x. This support is currently experimental, and must be \ -enabled with the -std=c++0x or -std=gnu++0x compiler options. +#error This file requires compiler and library support for the \ +ISO C++ 2011 standard. This support is currently experimental, and must be \ +enabled with the -std=c++11 or -std=gnu++11 compiler options. #endif #endif diff --git a/libstdc++-v3/testsuite/18_support/headers/cstdbool/std_c++0x_neg.cc b/libstdc++-v3/testsuite/18_support/headers/cstdbool/std_c++0x_neg.cc index 146b9656f3d..f8361c40cf2 100644 --- a/libstdc++-v3/testsuite/18_support/headers/cstdbool/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/18_support/headers/cstdbool/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/18_support/headers/cstdint/std_c++0x_neg.cc b/libstdc++-v3/testsuite/18_support/headers/cstdint/std_c++0x_neg.cc index afd65a36ade..7dbc10ef20c 100644 --- a/libstdc++-v3/testsuite/18_support/headers/cstdint/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/18_support/headers/cstdint/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/19_diagnostics/headers/system_error/std_c++0x_neg.cc b/libstdc++-v3/testsuite/19_diagnostics/headers/system_error/std_c++0x_neg.cc index 9698cf03191..38e27dc8246 100644 --- a/libstdc++-v3/testsuite/19_diagnostics/headers/system_error/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/19_diagnostics/headers/system_error/std_c++0x_neg.cc @@ -19,7 +19,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/20_util/headers/type_traits/std_c++0x_neg.cc b/libstdc++-v3/testsuite/20_util/headers/type_traits/std_c++0x_neg.cc index 4fd554e350f..e698114091b 100644 --- a/libstdc++-v3/testsuite/20_util/headers/type_traits/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/20_util/headers/type_traits/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/23_containers/headers/array/std_c++0x_neg.cc b/libstdc++-v3/testsuite/23_containers/headers/array/std_c++0x_neg.cc index e9317d7ed7f..bded29ee68c 100644 --- a/libstdc++-v3/testsuite/23_containers/headers/array/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/headers/array/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/23_containers/headers/tuple/std_c++0x_neg.cc b/libstdc++-v3/testsuite/23_containers/headers/tuple/std_c++0x_neg.cc index 0a2e073a50b..b5a10d2d611 100644 --- a/libstdc++-v3/testsuite/23_containers/headers/tuple/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/headers/tuple/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/23_containers/headers/unordered_map/std_c++0x_neg.cc b/libstdc++-v3/testsuite/23_containers/headers/unordered_map/std_c++0x_neg.cc index 0b32304ca61..612124006c1 100644 --- a/libstdc++-v3/testsuite/23_containers/headers/unordered_map/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/headers/unordered_map/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/23_containers/headers/unordered_set/std_c++0x_neg.cc b/libstdc++-v3/testsuite/23_containers/headers/unordered_set/std_c++0x_neg.cc index bc6963c80d0..85aca13c344 100644 --- a/libstdc++-v3/testsuite/23_containers/headers/unordered_set/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/headers/unordered_set/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/26_numerics/headers/ccomplex/std_c++0x_neg.cc b/libstdc++-v3/testsuite/26_numerics/headers/ccomplex/std_c++0x_neg.cc index 29e8dac5fa4..2f1226f3e17 100644 --- a/libstdc++-v3/testsuite/26_numerics/headers/ccomplex/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/26_numerics/headers/ccomplex/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/26_numerics/headers/cfenv/std_c++0x_neg.cc b/libstdc++-v3/testsuite/26_numerics/headers/cfenv/std_c++0x_neg.cc index 3a191069207..36e19d05af9 100644 --- a/libstdc++-v3/testsuite/26_numerics/headers/cfenv/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/26_numerics/headers/cfenv/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/26_numerics/headers/ctgmath/std_c++0x_neg.cc b/libstdc++-v3/testsuite/26_numerics/headers/ctgmath/std_c++0x_neg.cc index 23b266e8562..b8238df9591 100644 --- a/libstdc++-v3/testsuite/26_numerics/headers/ctgmath/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/26_numerics/headers/ctgmath/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/26_numerics/headers/random/std_c++0x_neg.cc b/libstdc++-v3/testsuite/26_numerics/headers/random/std_c++0x_neg.cc index 1f83cdac692..467caa0736c 100644 --- a/libstdc++-v3/testsuite/26_numerics/headers/random/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/26_numerics/headers/random/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/27_io/headers/cinttypes/std_c++0x_neg.cc b/libstdc++-v3/testsuite/27_io/headers/cinttypes/std_c++0x_neg.cc index 21da0770b9b..0285417ab12 100644 --- a/libstdc++-v3/testsuite/27_io/headers/cinttypes/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/27_io/headers/cinttypes/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/28_regex/headers/regex/std_c++0x_neg.cc b/libstdc++-v3/testsuite/28_regex/headers/regex/std_c++0x_neg.cc index 21a98b8ae69..b5289f802b6 100644 --- a/libstdc++-v3/testsuite/28_regex/headers/regex/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/28_regex/headers/regex/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/29_atomics/headers/atomic/std_c++0x_neg.cc b/libstdc++-v3/testsuite/29_atomics/headers/atomic/std_c++0x_neg.cc index be390b0f71c..38b49b6db11 100644 --- a/libstdc++-v3/testsuite/29_atomics/headers/atomic/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/29_atomics/headers/atomic/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include // { dg-excess-errors "In file included from" } -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/30_threads/headers/condition_variable/std_c++0x_neg.cc b/libstdc++-v3/testsuite/30_threads/headers/condition_variable/std_c++0x_neg.cc index 6e345243c26..5df33d943a9 100644 --- a/libstdc++-v3/testsuite/30_threads/headers/condition_variable/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/headers/condition_variable/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/30_threads/headers/future/std_c++0x_neg.cc b/libstdc++-v3/testsuite/30_threads/headers/future/std_c++0x_neg.cc index 5dbaffdefd9..ec018f73639 100644 --- a/libstdc++-v3/testsuite/30_threads/headers/future/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/headers/future/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/30_threads/headers/mutex/std_c++0x_neg.cc b/libstdc++-v3/testsuite/30_threads/headers/mutex/std_c++0x_neg.cc index 31bf41c06a5..3d7a09d829a 100644 --- a/libstdc++-v3/testsuite/30_threads/headers/mutex/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/headers/mutex/std_c++0x_neg.cc @@ -20,7 +20,7 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } diff --git a/libstdc++-v3/testsuite/30_threads/headers/thread/std_c++0x_neg.cc b/libstdc++-v3/testsuite/30_threads/headers/thread/std_c++0x_neg.cc index cc8a3877dec..6089f33171a 100644 --- a/libstdc++-v3/testsuite/30_threads/headers/thread/std_c++0x_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/headers/thread/std_c++0x_neg.cc @@ -22,4 +22,4 @@ #include -// { dg-error "upcoming ISO" "" { target *-*-* } 32 } +// { dg-error "ISO C.. 2011" "" { target *-*-* } 32 } -- 2.30.2