From: Jason Merrill <jason@redhat.com>
Date: Wed, 2 Jan 2013 19:58:07 +0000 (-0500)
Subject: * decl.c (check_default_argument): Use LOOKUP_IMPLICIT.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5f94242299859d125a38a89fa4291efe18b9180e;p=gcc.git

* decl.c (check_default_argument): Use LOOKUP_IMPLICIT.

From-SVN: r194816
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 626455696ce..fe0bfe2da08 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
 2013-01-02  Jason Merrill  <jason@redhat.com>
 
+	* decl.c (check_default_argument): Use LOOKUP_IMPLICIT.
+
 	PR c++/55032
 	PR c++/55245
 	* tree.c (build_cplus_array_type): Copy layout information
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 64bd4b5d2c0..52ceefce03b 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -10829,7 +10829,7 @@ check_default_argument (tree decl, tree arg)
      parameter type.  */
   ++cp_unevaluated_operand;
   perform_implicit_conversion_flags (decl_type, arg, tf_warning_or_error,
-				     LOOKUP_NORMAL);
+				     LOOKUP_IMPLICIT);
   --cp_unevaluated_operand;
 
   if (warn_zero_as_null_pointer_constant
diff --git a/gcc/testsuite/g++.dg/overload/defarg7.C b/gcc/testsuite/g++.dg/overload/defarg7.C
new file mode 100644
index 00000000000..8cc08f53869
--- /dev/null
+++ b/gcc/testsuite/g++.dg/overload/defarg7.C
@@ -0,0 +1,12 @@
+struct A
+{
+  A(const char *);
+  explicit A(const int *);
+};
+
+void f (A a = 0);
+
+int main()
+{
+  f();
+}