From: Magnus Fromreide <magfr@lysator.liu.se>
Date: Fri, 4 Nov 2011 17:38:16 +0000 (+0100)
Subject: parser.c (cp_parser_enumerator_list): Do not warn about trailing commas in C++0x... 
X-Git-Tag: releases/gcc-4.7.0~2480
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=669cc68c376f9caa8ed5ab7f62bc757fa8d096cb;p=thirdparty%2Fgcc.git

parser.c (cp_parser_enumerator_list): Do not warn about trailing commas in C++0x mode.

        * parser.c (cp_parser_enumerator_list): Do not warn about
        trailing commas in C++0x mode.

From-SVN: r180967
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 27c8b7092475..f984056dafc2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-09  Magnus Fromreide  <magfr@lysator.liu.se>
+
+        * parser.c (cp_parser_enumerator_list): Do not warn about
+        trailing commas in C++0x mode.
+
 2011-11-04  Olivier Goffart  <olivier@woboq.com>
 	    Jason Merrill  <jason@redhat.com>
 
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 811b2faf32e0..2798eb7e7cbb 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -14058,6 +14058,7 @@ cp_parser_elaborated_type_specifier (cp_parser* parser,
 
    enum-specifier:
      enum-head { enumerator-list [opt] }
+     enum-head { enumerator-list , } [C++0x]
 
    enum-head:
      enum-key identifier [opt] enum-base [opt]
@@ -14077,6 +14078,8 @@ cp_parser_elaborated_type_specifier (cp_parser* parser,
    GNU Extensions:
      enum-key attributes[opt] identifier [opt] enum-base [opt] 
        { enumerator-list [opt] }attributes[opt]
+     enum-key attributes[opt] identifier [opt] enum-base [opt]
+       { enumerator-list, }attributes[opt] [C++0x]
 
    Returns an ENUM_TYPE representing the enumeration, or NULL_TREE
    if the token stream isn't an enum-specifier after all.  */
@@ -14416,8 +14419,9 @@ cp_parser_enumerator_list (cp_parser* parser, tree type)
       /* If the next token is a `}', there is a trailing comma.  */
       if (cp_lexer_next_token_is (parser->lexer, CPP_CLOSE_BRACE))
 	{
-	  if (!in_system_header)
-	    pedwarn (input_location, OPT_pedantic, "comma at end of enumerator list");
+	  if (cxx_dialect < cxx0x && !in_system_header)
+	    pedwarn (input_location, OPT_pedantic,
+                     "comma at end of enumerator list");
 	  break;
 	}
     }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c9bd24808339..d0e94233c232 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-09  Magnus Fromreide  <magfr@lysator.liu.se>
+
+        * g++.dg/cpp0x/enum21a.C: Test that enum x { y, } does
+        generate a pedwarn in c++98-mode.
+        * g++.dg/cpp0x/enum21b.C: Test that enum x { y, }
+        don't generate a pedwarn in c++0x-mode.
+
 2011-11-04  Olivier Goffart  <olivier@woboq.com>
 
 	PR c++/50965
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum21a.C b/gcc/testsuite/g++.dg/cpp0x/enum21a.C
new file mode 100644
index 000000000000..5526811a635a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/enum21a.C
@@ -0,0 +1,4 @@
+// { dg-do compile }
+// { dg-options "-pedantic -std=c++98" }
+
+enum x { y, }; // { dg-warning "comma at end of enumerator list" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/enum21b.C b/gcc/testsuite/g++.dg/cpp0x/enum21b.C
new file mode 100644
index 000000000000..48989128d89c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/enum21b.C
@@ -0,0 +1,4 @@
+// { dg-do compile }
+// { dg-options "-pedantic -std=c++0x" }
+
+enum x { y, };