Use ::new to avoid finding overloaded operator new

Backport from mainline:
2016-08-06  Jonathan Wakely  <jwakely@redhat.com>

	PR libstdc++/72820
	* include/std/functional (_Function_base::_Base_manager::_M_clone):
	Qualify new operator.
	* testsuite/20_util/function/cons/72820.cc: New test.

From-SVN: r241264

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 89519215981666394b4b353646467548b65e2b9e..77d7de5a136d458651d2f25a70a76a7dd770f471 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2016-10-17  Jonathan Wakely  <jwakely@redhat.com>
+
+       Backport from mainline:
+       2016-08-06  Jonathan Wakely  <jwakely@redhat.com>
+
+       PR libstdc++/72820
+       * include/std/functional (_Function_base::_Base_manager::_M_clone):
+       Qualify new operator.
+       * testsuite/20_util/function/cons/72820.cc: New test.
+
 2016-10-17  Jonathan Wakely  <jwakely@redhat.com>
 
        PR libstdc++/77994

diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional
index 9b0f801da1c9e4cdd49930543c954217ccbc27d3..e3fce0cada931e64731433c3be23238ada577b7f 100644 (file)
--- a/libstdc++-v3/include/std/functional
+++ b/libstdc++-v3/include/std/functional
@@ -1699,7 +1699,7 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type)
        static void
        _M_clone(_Any_data& __dest, const _Any_data& __source, true_type)
        {
-         new (__dest._M_access()) _Functor(__source._M_access<_Functor>());
+         ::new (__dest._M_access()) _Functor(__source._M_access<_Functor>());
        }
 
        // Clone a function object that is not location-invariant or
@@ -1780,7 +1780,7 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type)
       private:
        static void
        _M_init_functor(_Any_data& __functor, _Functor&& __f, true_type)
-       { new (__functor._M_access()) _Functor(std::move(__f)); }
+       { ::new (__functor._M_access()) _Functor(std::move(__f)); }
 
        static void
        _M_init_functor(_Any_data& __functor, _Functor&& __f, false_type)

diff --git a/libstdc++-v3/testsuite/20_util/function/cons/72820.cc b/libstdc++-v3/testsuite/20_util/function/cons/72820.cc
new file mode 100644 (file)
index 0000000..1e4e0e8
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/function/cons/72820.cc
@@ -0,0 +1,28 @@
+// Copyright (C) 2016 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-options "-std=gnu++11" }
+// { dg-do compile }
+
+#include <functional>
+
+struct foo {
+  void operator()() { }
+  static void* operator new(std::size_t, void* p);
+};
+
+std::function<void()> f = foo{};