re PR c++/12479 ([3.4 only] System header should not cause -pedantic to error about...

	PR c++/12479
	* parser.c (cp_parser_declaration_seq_opt): Only issue "extra ;"
	pedwarn when not in a system header.

	PR c++/12479
	* g++.dg/parse/semicolon1.C: New test.
	* g++.dg/parse/semicolon1.h: Likewise.

From-SVN: r74940

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d667193871e7236bae2d9de27904161e7577efc4..05b58a873df488c6c28fd88497a4d953d0917715 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-22  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/12479
+       * parser.c (cp_parser_declaration_seq_opt): Only issue "extra ;"
+       pedwarn when not in a system header.
+
 2003-12-21  Mark Mitchell  <mark@codesourcery.com>
 
        * cp-tree.h (cp_tree_index): Remove CPTI_RECORD_TYPE,

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 12c883e7bf2fdafa7d5081102c55ce80e642f878..eae46cf81ea95dbedde132e7ac94e9341b348fa4 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -6128,7 +6128,7 @@ cp_parser_declaration_seq_opt (cp_parser* parser)
        {
          /* A declaration consisting of a single semicolon is
             invalid.  Allow it unless we're being pedantic.  */
-         if (pedantic)
+         if (pedantic && !in_system_header)
            pedwarn ("extra `;'");
          cp_lexer_consume_token (parser->lexer);
          continue;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3d9d88a898943d8551a5cbb613fb493960367512..0eb74176a22d2f88740ef3421fe1a02216eb515e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-22  Mark Mitchell  <mark@codesourcery.com>
+
+       PR c++/12479
+       * g++.dg/parse/semicolon1.C: New test.
+       * g++.dg/parse/semicolon1.h: Likewise.
+
 2003-12-22  Andrew Pinski  <pinskia@physics.uc.edu>
 
        PR c/9163

diff --git a/gcc/testsuite/g++.dg/parse/semicolon1.C b/gcc/testsuite/g++.dg/parse/semicolon1.C
new file mode 100644 (file)
index 0000000..22c1e86
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/semicolon1.C
@@ -0,0 +1,4 @@
+// PR c++/12479
+// { dg-options "-pedantic" }
+
+#include "semicolon1.h"

diff --git a/gcc/testsuite/g++.dg/parse/semicolon1.h b/gcc/testsuite/g++.dg/parse/semicolon1.h
new file mode 100644 (file)
index 0000000..0487fc7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/semicolon1.h
@@ -0,0 +1,2 @@
+#pragma GCC system_header
+;