aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/parser.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7dd1d88..859f979 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-12 Steven Bosscher <stevenb@suse.de>
+
+ PR c++/13558
+ * parser.c (cp_parser_member_declaration): Any non-type is also
+ not a class or a function.
+
2004-01-12 Jason Merrill <jason@redhat.com>
PR c++/12815
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index fe3a3de..3de7c1d 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -12226,7 +12226,7 @@ cp_parser_member_declaration (cp_parser* parser)
}
}
}
- if (!type)
+ if (!type || !TYPE_P (type))
error ("friend declaration does not name a class or "
"function");
else