diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6a7a4a4..6e7bd96 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2007-08-16 Paolo Carlini <pcarlini@suse.de> + + PR c++/31132 + * pt.c (tsubst_friend_function): When check_classfn + returns error_mark_node likewise return it. + 2007-08-15 Jakub Jelinek <jakub@redhat.com> PR c++/32992 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index f414bc3..68cd9a5 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6289,7 +6289,7 @@ tsubst_friend_function (tree decl, tree args) tree fn = check_classfn (context, new_friend, NULL_TREE); - if (fn && fn != error_mark_node) + if (fn) new_friend = fn; } } |