OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/53872 ([C++11] ADL bug in std::thread) 

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.

From-SVN: r189329
This commit is contained in:
Paolo Carlini 2012-07-06 13:55:58 +00:00 committed by Paolo Carlini
parent 81ef887874
commit f8b54112b5
3 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
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.
2012-07-05 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/std/condition_variable: Update copyright years.

4
libstdc++-v3/include/std/thread
View File

@ -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 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_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));
}
};

37
libstdc++-v3/testsuite/30_threads/thread/adl.cc Normal file
View File

@ -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()));
}