parser.c (cp_parser_using_declaration): Consume the semicolon after bare parameter...

	* parser.c (cp_parser_using_declaration): Consume the semicolon
	after bare parameter pack error.

From-SVN: r208413

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f617c622fc14679548a66b1c14d458243a0a2cfc..aa8b9143a07cece49cf6acb831cc26fa181ba7ba 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2014-03-07  Jason Merrill  <jason@redhat.com>
 
+       * parser.c (cp_parser_using_declaration): Consume the semicolon
+       after bare parameter pack error.
+
        * cp-tree.h (REF_PARENTHESIZED_P): New.
        * semantics.c (force_paren_expr): Set it.
        * pt.c (do_auto_deduction): Check it.

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 8bc1126e2382e1608d44cf137d12c13eea4b2d59..71a2a9ed1c55587ce351c8ede260626b23b2b8e4 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -16016,7 +16016,10 @@ cp_parser_using_declaration (cp_parser* parser,
            USING_DECL_TYPENAME_P (decl) = 1;
 
          if (check_for_bare_parameter_packs (decl))
-            return false;
+           {
+             cp_parser_require (parser, CPP_SEMICOLON, RT_SEMICOLON);
+             return false;
+           }
          else
            /* Add it to the list of members in this class.  */
            finish_member_declaration (decl);
@@ -16031,7 +16034,10 @@ cp_parser_using_declaration (cp_parser* parser,
                                         decl, NLE_NULL,
                                         token->location);
          else if (check_for_bare_parameter_packs (decl))
-           return false;
+           {
+             cp_parser_require (parser, CPP_SEMICOLON, RT_SEMICOLON);
+             return false;
+           }
          else if (!at_namespace_scope_p ())
            do_local_using_decl (decl, qscope, identifier);
          else