fix the fibs in previous entry

From-SVN: r35756

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d92ba161a2fd9b90526b72234efbe839f6a9eadd..ea1ed1de29380b4dc8aac265a38ec095afa80d36 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -12,8 +12,9 @@
        * error.c (dump_type, case TYPENAME_TYPE): Don't emit the
        aggregate tag on the typename's context.
        
-       * pt.c (tsubst_friend_class): Return NULL, if parms becomes NULL.
-       (instantiate_class_template): Ignore NULL friend types.
+       * pt.c (tsubst_friend_class): Return error_mark_node, if
+       parms becomes NULL.
+       (instantiate_class_template): Ignore error_mark_node friend types.
 
 2000-08-14  Nathan Sidwell  <nathan@codesourcery.com>