From d926ac9fa2ff430ab544517ab9b6e6b0e177ec5a Mon Sep 17 00:00:00 2001 From: paolo Date: Fri, 6 Jul 2012 13:55:58 +0000 Subject: [PATCH] 2012-07-06 Paolo Carlini 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 --- libstdc++-v3/ChangeLog | 7 +++++ libstdc++-v3/include/std/thread | 4 +-- libstdc++-v3/testsuite/30_threads/thread/adl.cc | 37 +++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 libstdc++-v3/testsuite/30_threads/thread/adl.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c654e87..0eb76a6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2012-07-06 Paolo Carlini + + 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 * include/std/condition_variable: Update copyright years. diff --git a/libstdc++-v3/include/std/thread b/libstdc++-v3/include/std/thread index 1d17337..f6b19ab 100644 --- a/libstdc++-v3/include/std/thread +++ b/libstdc++-v3/include/std/thread @@ -1,6 +1,6 @@ // -*- 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)); } }; 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 0000000..4ef57c0 --- /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 +// . + +#include +#include +#include + +template +void make_shared(P&&...) +{} + +struct C {}; + +void f(C){} + +// PR libstdc++/53872 +int main() +{ + std::thread t(std::bind(&::f, C())); +} -- 2.7.4