Patchwork [v3] libstdc++/53872

login
register
mail settings
Submitter Paolo Carlini
Date July 6, 2012, 1:55 p.m.
Message ID <4FF6EE57.70608@oracle.com>
Download mbox | patch
Permalink /patch/169475/
State New
Headers show

Comments

Paolo Carlini - July 6, 2012, 1:55 p.m.
Hi,

tested x86_64-linux, committed mainline and 4_7-branch.

Thanks,
Paolo.

////////////////////
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.

Patch

Index: include/std/thread
===================================================================
--- include/std/thread	(revision 189314)
+++ include/std/thread	(working copy)
@@ -1,6 +1,6 @@ 
 // <thread> -*- C++ -*-
 
-// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010, 2011, 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
@@ -188,7 +188,7 @@ 
       _M_make_routine(_Callable&& __f)
       {
 	// Create and allocate full data structure, not base.
-	return make_shared<_Impl<_Callable>>(std::forward<_Callable>(__f));
+	return std::make_shared<_Impl<_Callable>>(std::forward<_Callable>(__f));
       }
   };
 
Index: testsuite/30_threads/thread/adl.cc
===================================================================
--- testsuite/30_threads/thread/adl.cc	(revision 0)
+++ testsuite/30_threads/thread/adl.cc	(revision 0)
@@ -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()));
+}