2012-07-06 Paolo Carlini <paolo.carlini@oracle.com>

	PR libstdc++/53872
	* include/std/thread (thread::_M_make_routine): Qualify make_shared
	to prevent ADL.
	* testsuite/30_threads/thread/adl.cc: New.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@189329 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 37 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/30_threads/thread/adl.cc b/libstdc++-v3/testsuite/30_threads/thread/adl.cc
new file mode 100644
index 00000000000..4ef57c0283c
--- /dev/null
+++ b/libstdc++-v3/testsuite/30_threads/thread/adl.cc
@@ -0,0 +1,37 @@
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+// Copyright (C) 2012 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/>.
+
+#include <thread>
+#include <memory>
+#include <functional>
+
+template<typename, typename...P>
+void make_shared(P&&...)
+{}
+
+struct C {};
+
+void f(C){}
+
+// PR libstdc++/53872
+int main()
+{
+  std::thread t(std::bind(&::f, C()));
+}