aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2010-12-28 21:17:37 -0500
committerJason Merrill <jason@gcc.gnu.org>2010-12-28 21:17:37 -0500
commit6f13089ed5931ed54b0ca7412814121134c9bcdd (patch)
tree72576b09d977772d193afacea36c0a3c959dcae0
parentdb0581ae639455badae7df2198a3a5c06ea57581 (diff)
downloadgcc-6f13089ed5931ed54b0ca7412814121134c9bcdd.zip
gcc-6f13089ed5931ed54b0ca7412814121134c9bcdd.tar.gz
gcc-6f13089ed5931ed54b0ca7412814121134c9bcdd.tar.bz2
parser.c (cp_parser_unary_expression): Remove redundant C++0x check.
* parser.c (cp_parser_unary_expression): Remove redundant C++0x check. From-SVN: r168308
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/parser.c4
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");