summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsteven <steven@138bc75d-0d04-0410-961f-82ee72b054a4>2004-01-13 00:44:51 +0000
committersteven <steven@138bc75d-0d04-0410-961f-82ee72b054a4>2004-01-13 00:44:51 +0000
commit069754afb073c81f240ecbcf1acdffec9d7d0da3 (patch)
tree369ea04fb2e5c5c9e577d0aa0daf8cfce11b65ac
parentf3e34069e244ef71b5602365ef21f32994afc318 (diff)
downloadppe42-gcc-069754afb073c81f240ecbcf1acdffec9d7d0da3.tar.gz
ppe42-gcc-069754afb073c81f240ecbcf1acdffec9d7d0da3.zip
PR c++/13558
* parser.c (cp_parser_member_declaration): Any non-type is also not a class or a function. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75776 138bc75d-0d04-0410-961f-82ee72b054a4
-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 7dd1d8862a7..859f9799a92 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 fe3a3dec965..3de7c1d86d3 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
OpenPOWER on IntegriCloud