From b9f77b956a08a66d1964b4c5e1b3ab2aa7a440d3 Mon Sep 17 00:00:00 2001 From: jason Date: Wed, 16 Mar 2011 17:00:13 +0000 Subject: [PATCH] * call.c (convert_default_arg): Use LOOKUP_IMPLICIT. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@171052 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/call.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 58ea1a5..2c28977 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2011-03-16 Jason Merrill + + * call.c (convert_default_arg): Use LOOKUP_IMPLICIT. + 2011-03-16 Jakub Jelinek * cp-objcp-common.c (cp_function_decl_explicit_p): Don't crash if diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 499ed03..388f46c 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -5803,7 +5803,7 @@ convert_default_arg (tree type, tree arg, tree fn, int parmnum) if (TREE_CODE (arg) == CONSTRUCTOR) { arg = digest_init (type, arg); - arg = convert_for_initialization (0, type, arg, LOOKUP_NORMAL, + arg = convert_for_initialization (0, type, arg, LOOKUP_IMPLICIT, ICR_DEFAULT_ARGUMENT, fn, parmnum, tf_warning_or_error); } @@ -5817,7 +5817,7 @@ convert_default_arg (tree type, tree arg, tree fn, int parmnum) are never modified in place. */ if (!CONSTANT_CLASS_P (arg)) arg = unshare_expr (arg); - arg = convert_for_initialization (0, type, arg, LOOKUP_NORMAL, + arg = convert_for_initialization (0, type, arg, LOOKUP_IMPLICIT, ICR_DEFAULT_ARGUMENT, fn, parmnum, tf_warning_or_error); arg = convert_for_arg_passing (type, arg); -- 2.7.4