diff options
| author | Jason Merrill <jason@redhat.com> | 2014-03-07 15:00:25 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-03-07 15:00:25 -0500 |
| commit | 941515205deb8586b79b3f02722d2d7a9532539f (patch) | |
| tree | 9f4e6ef97b2370045e141eed1099d19e5a193043 /gcc | |
| parent | 0e4cf8872a7f2e74c9905f2aeef75b918f5c8d80 (diff) | |
| download | gcc-941515205deb8586b79b3f02722d2d7a9532539f.zip gcc-941515205deb8586b79b3f02722d2d7a9532539f.tar.gz gcc-941515205deb8586b79b3f02722d2d7a9532539f.tar.bz2 | |
parser.c (cp_parser_using_declaration): Consume the semicolon after bare parameter pack error.
* parser.c (cp_parser_using_declaration): Consume the semicolon
after bare parameter pack error.
From-SVN: r208413
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f617c62..aa8b914 100644 --- 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 8bc1126..71a2a9e 100644 --- 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 |