diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d36ffaa..3be7f7d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-10-11 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/50611 + * pt.c (tsubst_copy_and_build): If (complain & tf_error) is false + do not call unqualified_name_lookup_error. + 2011-10-10 Paolo Carlini <paolo.carlini@oracle.com> PR c++/50660 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c95f1cb..2cb478d 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -13026,7 +13026,11 @@ tsubst_copy_and_build (tree t, if (error_msg) error (error_msg); if (!function_p && TREE_CODE (decl) == IDENTIFIER_NODE) - decl = unqualified_name_lookup_error (decl); + { + if (complain & tf_error) + unqualified_name_lookup_error (decl); + decl = error_mark_node; + } return decl; } |