From: Jason Merrill <jason@redhat.com>
Date: Thu, 27 Oct 2016 13:39:48 +0000 (-0400)
Subject: * class.c (add_method): Allow using-declarations to coexist.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7c92f4ec6107dc41199d8b61c9c4a598cadd9011;p=gcc.git

* class.c (add_method): Allow using-declarations to coexist.

From-SVN: r241620
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1276d13ad70..efce361f880 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-26  Jason Merrill  <jason@redhat.com>
+
+	* class.c (add_method): Allow using-declarations to coexist.
+
 2016-10-25  Jason Merrill  <jason@redhat.com>
 
 	* constexpr.c (maybe_constant_init): Pull out TARGET_EXPR_INITIAL.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index d334b7cdd6c..a2a93469151 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -1094,6 +1094,11 @@ add_method (tree type, tree method, tree using_decl)
       if (TREE_CODE (fn) != TREE_CODE (method))
 	continue;
 
+      /* Two using-declarations can coexist, we'll complain about ambiguity in
+	 overload resolution.  */
+      if (using_decl && TREE_CODE (fns) == OVERLOAD && OVL_USED (fns))
+	continue;
+
       /* [over.load] Member function declarations with the
 	 same name and the same parameter types cannot be
 	 overloaded if any of them is a static member
diff --git a/gcc/testsuite/g++.dg/overload/using4.C b/gcc/testsuite/g++.dg/overload/using4.C
new file mode 100644
index 00000000000..e4ee8232ebe
--- /dev/null
+++ b/gcc/testsuite/g++.dg/overload/using4.C
@@ -0,0 +1,19 @@
+struct A
+{
+  void f();
+};
+
+struct B
+{
+  void f();
+};
+
+struct C: A,B {
+  using A::f;
+  using B::f;
+};
+
+int main()
+{
+  C().f();			// { dg-error "ambiguous" }
+}