From patchwork Mon Oct 31 05:26:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 122733 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 1139CB6F76 for ; Mon, 31 Oct 2011 16:27:03 +1100 (EST) Received: (qmail 1189 invoked by alias); 31 Oct 2011 05:27:00 -0000 Received: (qmail 1172 invoked by uid 22791); 31 Oct 2011 05:26:56 -0000 X-SWARE-Spam-Status: No, hits=-7.0 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, SPF_HELO_PASS, TW_CX, TW_TD, TW_TG X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 31 Oct 2011 05:26:37 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9V5Qaot024207 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 31 Oct 2011 01:26:37 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p9V5QaQM020936; Mon, 31 Oct 2011 01:26:36 -0400 Received: from [0.0.0.0] (ovpn-113-26.phx2.redhat.com [10.3.113.26]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p9V5QYf8005200; Mon, 31 Oct 2011 01:26:34 -0400 Message-ID: <4EAE3189.2010909@redhat.com> Date: Mon, 31 Oct 2011 01:26:33 -0400 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; Linux i686; rv:7.0.1) Gecko/20111001 Thunderbird/7.0.1 MIME-Version: 1.0 To: Paolo Carlini CC: "gcc-patches@gcc.gnu.org" Subject: Re: C++ PATCH to add -std=c++11 ?? References: <4EACA483.1010505@oracle.com> <4EACA53F.7090106@oracle.com> In-Reply-To: <4EACA53F.7090106@oracle.com> Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Here's my start at adjusting things to use the C++11 name; feel free to run with it. Looking at it again, I think adding __GXX_EXPERIMENTAL_CXX11__ is a mistake, we should just set __cplusplus to the C++11 value. Jason commit 9c331b6de02e796fa25b04ed206b8570c83ee237 Author: Jason Merrill Date: Fri Aug 12 17:09:47 2011 -0400 * 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. * c-cppbuiltin.c (c_cpp_builtins): Also define __GXX_EXPERIMENTAL_CXX11__. diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h index be9d729..71746a9 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-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index bb9893a..f6075d9 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -598,8 +598,11 @@ c_cpp_builtins (cpp_reader *pfile) cpp_define (pfile, "__DEPRECATED"); if (flag_rtti) cpp_define (pfile, "__GXX_RTTI"); - if (cxx_dialect == cxx0x) - cpp_define (pfile, "__GXX_EXPERIMENTAL_CXX0X__"); + if (cxx_dialect == cxx11) + { + cpp_define (pfile, "__GXX_EXPERIMENTAL_CXX0X__"); + cpp_define (pfile, "__GXX_EXPERIMENTAL_CXX11__"); + } } /* Note that we define this for C as well, so that we know if __attribute__((cleanup)) will interface with EH. */ diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c index 6869d5c..b15dcb4 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); 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 693f191..336a75a 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 commit 0b1d67e9a210b53328bf28c04c7e967dfe1a13a4 Author: Jason Merrill Date: Fri Aug 12 18:10:33 2011 -0400 * 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. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 03521e5..a014d25 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 544c4d1..992b810 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"); - break; + "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 090482c..63f9262 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 d057776..493e3e6 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 4ae3944..1a0189b 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 } commit f87d07ed310959e53bd2ce30bde00394155a8764 Author: Jason Merrill Date: Fri Aug 12 20:08:27 2011 -0400 * include/bits/c++0x_warning.h: Change -std=c++0x to -std=c++11. diff --git a/libstdc++-v3/include/bits/c++0x_warning.h b/libstdc++-v3/include/bits/c++0x_warning.h index 0685a50..68d9694 100644 --- a/libstdc++-v3/include/bits/c++0x_warning.h +++ b/libstdc++-v3/include/bits/c++0x_warning.h @@ -28,10 +28,10 @@ #ifndef _CXX0X_WARNING_H #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. +#ifndef __GXX_EXPERIMENTAL_CXX11__ +#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 146b965..f8361c4 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 afd65a3..7dbc10e 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 9698cf0..38e27dc 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 4fd554e..e698114 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 e9317d7..bded29e 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 0a2e073..b5a10d2 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 0b32304..6121240 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 bc6963c..85aca13 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 29e8dac..2f1226f 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 3a19106..36e19d0 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 23b266e..b8238df 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 1f83cda..467caa0 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 21da077..0285417 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 21a98b8..b5289f8 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 be390b0..38b49b6 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 6e34524..5df33d9 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 5dbaffd..ec018f7 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 31bf41c..3d7a09d 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 cc8a387..6089f33 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 }