diff options
| author | Jason Merrill <jason@redhat.com> | 2011-03-16 13:00:13 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-03-16 13:00:13 -0400 |
| commit | a8d7041a307a92daf512f1b076832834cdb16c9b (patch) | |
| tree | 79472995fe46aef2e6bf6f7488842bb5d9bc5c4a | |
| parent | 51cdce9ab62efedcb0ea13ccce356b982be68d2a (diff) | |
| download | gcc-a8d7041a307a92daf512f1b076832834cdb16c9b.zip gcc-a8d7041a307a92daf512f1b076832834cdb16c9b.tar.gz gcc-a8d7041a307a92daf512f1b076832834cdb16c9b.tar.bz2 | |
* call.c (convert_default_arg): Use LOOKUP_IMPLICIT.
From-SVN: r171052
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | 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 <jason@redhat.com> + + * call.c (convert_default_arg): Use LOOKUP_IMPLICIT. + 2011-03-16 Jakub Jelinek <jakub@redhat.com> * 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); |