diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-12-21 13:02:18 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-12-21 13:02:18 +0000 |
| commit | a716d11ad4dd132ece38e15d970eeb1bc8e5b19e (patch) | |
| tree | 4b0798b232d11b64b26157857d8d71f22b52dde6 | |
| parent | e9e6a995380186401dd75b2dfb4331e2c85e9e25 (diff) | |
| download | gcc-a716d11ad4dd132ece38e15d970eeb1bc8e5b19e.zip gcc-a716d11ad4dd132ece38e15d970eeb1bc8e5b19e.tar.gz gcc-a716d11ad4dd132ece38e15d970eeb1bc8e5b19e.tar.bz2 | |
libstdc++/68995 qualify calls to __callable_functor
PR libstdc++/68995
* include/std/functional (_function_handler, function): Qualify
__callable_functor.
* testsuite/20_util/function/68995.cc: New.
From-SVN: r231880
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/functional | 9 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/function/68995.cc | 27 |
3 files changed, 37 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8ea4538..6f77d03 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2015-12-21 Jonathan Wakely <jwakely@redhat.com> + PR libstdc++/68995 + * include/std/functional (_function_handler, function): Qualify + __callable_functor. + * testsuite/20_util/function/68995.cc: New. + PR libstdc++/68276 * include/std/functional (__invoke_impl, _Mem_fn::operator()): Qualify std::forward. diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 4d08e12..b994df4 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -1752,7 +1752,7 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type) static _Res _M_invoke(const _Any_data& __functor, _ArgTypes&&... __args) { - return __callable_functor(**_Base::_M_get_pointer(__functor))( + return std::__callable_functor(**_Base::_M_get_pointer(__functor))( std::forward<_ArgTypes>(__args)...); } }; @@ -1767,7 +1767,7 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type) static void _M_invoke(const _Any_data& __functor, _ArgTypes&&... __args) { - __callable_functor(**_Base::_M_get_pointer(__functor))( + std::__callable_functor(**_Base::_M_get_pointer(__functor))( std::forward<_ArgTypes>(__args)...); } }; @@ -1847,8 +1847,9 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type) typedef _Res _Signature_type(_ArgTypes...); template<typename _Functor> - using _Invoke = decltype(__callable_functor(std::declval<_Functor&>()) - (std::declval<_ArgTypes>()...) ); + using _Invoke + = decltype(std::__callable_functor(std::declval<_Functor&>()) + (std::declval<_ArgTypes>()...) ); // Used so the return type convertibility checks aren't done when // performing overload resolution for copy construction/assignment. diff --git a/libstdc++-v3/testsuite/20_util/function/68995.cc b/libstdc++-v3/testsuite/20_util/function/68995.cc new file mode 100644 index 0000000..42bd5670 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/function/68995.cc @@ -0,0 +1,27 @@ +// Copyright (C) 2015 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 <tr1/memory> +#include <functional> +#include <tr1/functional> + +std::tr1::shared_ptr<int> test() { return {}; } + +std::function<std::tr1::shared_ptr<int>()> func = test; |