diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b8247b4..f11d7d2 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2010-12-23 Jason Merrill <jason@redhat.com> + + * parser.c (cp_parser_unary_expression): Remove redundant C++0x + check. + 2010-12-27 Jakub Jelinek <jakub@redhat.com> PR c++/46626 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 743d774..43e91b0 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -5944,9 +5944,7 @@ cp_parser_unary_expression (cp_parser *parser, bool address_p, bool cast_p, /* ISO C++ defines alignof only with types, not with expressions. So pedwarn if alignof is used with a non- type expression. However, __alignof__ is ok. */ - if (cxx_dialect >= cxx0x - && !strcmp (IDENTIFIER_POINTER (token->u.value), - "alignof")) + if (!strcmp (IDENTIFIER_POINTER (token->u.value), "alignof")) pedwarn (token->location, OPT_pedantic, "ISO C++ does not allow %<alignof%> " "with a non-type"); |