From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 18 May 2017 15:31:36 +0000 (+0100)
Subject: PR libstdc++/80504 qualify calls to avoid ADL
X-Git-Tag: releases/gcc-5.5.0~348
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=550c2710dbc424f411f96d4ba75ba1314256eba6;p=thirdparty%2Fgcc.git

PR libstdc++/80504 qualify calls to avoid ADL

Backport from mainline
2017-04-24  Jonathan Wakely  <jwakely@redhat.com>

	PR libstdc++/80504
	* include/std/functional (ref, cref): Qualify calls.
	* testsuite/20_util/reference_wrapper/80504.cc: New test.

From-SVN: r248237
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 539a3927914e..4da56ad76e3f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 2017-05-18  Jonathan Wakely  <jwakely@redhat.com>
 
+	Backport from mainline
+	2017-04-24  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR libstdc++/80504
+	* include/std/functional (ref, cref): Qualify calls.
+	* testsuite/20_util/reference_wrapper/80504.cc: New test.
+
 	Backport from mainline
 	2017-04-19  Jonathan Wakely  <jwakely@redhat.com>
 
diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional
index a8d81d27577f..ebbf7e8798b4 100644
--- a/libstdc++-v3/include/std/functional
+++ b/libstdc++-v3/include/std/functional
@@ -448,17 +448,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   template<typename _Tp>
     void cref(const _Tp&&) = delete;
 
-  /// Partial specialization.
+  /// std::ref overload to prevent wrapping a reference_wrapper
   template<typename _Tp>
     inline reference_wrapper<_Tp>
     ref(reference_wrapper<_Tp> __t) noexcept
-    { return ref(__t.get()); }
+    { return std::ref(__t.get()); }
 
-  /// Partial specialization.
+  /// std::cref overload to prevent wrapping a reference_wrapper
   template<typename _Tp>
     inline reference_wrapper<const _Tp>
     cref(reference_wrapper<_Tp> __t) noexcept
-    { return cref(__t.get()); }
+    { return std::cref(__t.get()); }
 
   // @} group functors
 
diff --git a/libstdc++-v3/testsuite/20_util/reference_wrapper/80504.cc b/libstdc++-v3/testsuite/20_util/reference_wrapper/80504.cc
new file mode 100644
index 000000000000..727a560cd17a
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/reference_wrapper/80504.cc
@@ -0,0 +1,34 @@
+// Copyright (C) 2017 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-do compile { target c++11 } }
+
+#include <functional>
+
+namespace X {
+  struct Y { };
+  template<typename T> void ref(T) { }
+  template<typename T> void cref(T) { }
+}
+
+int main()
+{
+  X::Y i;
+  std::reference_wrapper<X::Y> r(i);
+  ref(r);
+  cref(r);
+}