From: Jason Merrill <jason@redhat.com>
Date: Thu, 19 Jun 2014 09:36:09 +0000 (-0400)
Subject: re PR c++/59296 ([c++11] ref-qualified member function is ambiguous)
X-Git-Tag: releases/gcc-5.1.0~6771
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7744b8eeae40c5979d079370b856ceb6b05f997;p=thirdparty%2Fgcc.git

re PR c++/59296 ([c++11] ref-qualified member function is ambiguous)

	PR c++/59296
	* call.c (add_function_candidate): Also set LOOKUP_NO_TEMP_BIND.

From-SVN: r211821
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7e7521b750cf..a992c87de858 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-19  Jason Merrill  <jason@redhat.com>
+
+	PR c++/59296
+	* call.c (add_function_candidate): Also set LOOKUP_NO_TEMP_BIND.
+
 2014-06-18  Jason Merrill  <jason@redhat.com>
 
 	PR c++/59296
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index b4adf363be91..e147abdd0831 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -2026,7 +2026,8 @@ add_function_candidate (struct z_candidate **candidates,
 		  bool rv = FUNCTION_RVALUE_QUALIFIED (TREE_TYPE (fn));
 		  parmtype = cp_build_reference_type (parmtype, rv);
 		  /* Don't bind an rvalue to a const lvalue ref-qualifier.  */
-		  lflags |= LOOKUP_NO_RVAL_BIND;
+		  if (!rv)
+		    lflags |= LOOKUP_NO_RVAL_BIND|LOOKUP_NO_TEMP_BIND;
 		}
 	      else
 		{