From 1941b0ca5b772c73ff39bece36111e25ee83df7a Mon Sep 17 00:00:00 2001 From: Marc Glisse Date: Mon, 30 Apr 2012 18:36:37 +0200 Subject: [PATCH] re PR c++/51314 ([C++0x] sizeof... and parentheses) PR c++/51314 * parser.c (cp_parser_sizeof_operand): Require parentheses for sizeof... From-SVN: r186988 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/parser.c | 3 +++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/cpp0x/variadic76.C | 3 ++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8d99c17fbf2..282912a6a6b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2012-04-30 Marc Glisse + + PR c++/51314 + * parser.c (cp_parser_sizeof_operand): Require parentheses for + sizeof... + 2012-04-30 Dodji Seketeli Fix location for static class members diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index f0f7e987efb..8fcbba60164 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -21969,6 +21969,9 @@ cp_parser_sizeof_operand (cp_parser* parser, enum rid keyword) /*attrlist=*/NULL); } } + else if (pack_expansion_p) + permerror (cp_lexer_peek_token (parser->lexer)->location, + "% argument must be surrounded by parentheses"); /* If the type-id production did not work out, then we must be looking at the unary-expression production. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7f895fdae33..6613970d23c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2012-04-30 Marc Glisse + + PR c++/51314 + * g++.dg/cpp0x/vt-51314.C: New test. + * g++.dg/cpp0x/variadic76.C: Fix. + 2012-04-30 Greta Yorsh * gcc.dg/pr52283.c: Add missing dg-warning and dg-options. diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic76.C b/gcc/testsuite/g++.dg/cpp0x/variadic76.C index a9f8eabb34e..fb80244d658 100644 --- a/gcc/testsuite/g++.dg/cpp0x/variadic76.C +++ b/gcc/testsuite/g++.dg/cpp0x/variadic76.C @@ -4,7 +4,8 @@ template int foo () { - return sizeof... N (); // { dg-error "cannot be used as a function" } + return sizeof... (N ()); // { dg-error "cannot be used as a function" } + return sizeof... (N) (); // { dg-error "cannot be used as a function" } } int bar ()