git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libstdc++/68995 qualify calls to __callable_functor 

PR libstdc++/68995
	* include/std/functional (_Function_handler::_M_invoke): Qualify
	__callable_functor.
	* testsuite/20_util/function/68995.cc: New.

From-SVN: r232281
This commit is contained in:
Jonathan Wakely 2016-01-12 16:54:10 +00:00 committed by Jonathan Wakely
parent f0424299a9
commit 5b41cafb34
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,10 @@
2016-01-12 Jonathan Wakely <jwakely@redhat.com> 2016-01-12 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/68995
* include/std/functional (_Function_handler::_M_invoke): Qualify
__callable_functor.
* testsuite/20_util/function/68995.cc: New.
PR libstdc++/69005 PR libstdc++/69005
PR libstdc++/69222 PR libstdc++/69222
* include/std/functional (function::_Invoke): Remove, use result_of. * include/std/functional (function::_Invoke): Remove, use result_of.

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

@ -1883,7 +1883,7 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type)
static _Res static _Res
_M_invoke(const _Any_data& __functor, _ArgTypes&&... __args) _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)...); std::forward<_ArgTypes>(__args)...);
} }
}; };
@ -1898,7 +1898,7 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type)
static void static void
_M_invoke(const _Any_data& __functor, _ArgTypes&&... __args) _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)...); std::forward<_ArgTypes>(__args)...);
} }
}; };

32
libstdc++-v3/testsuite/20_util/function/68995.cc Normal file
View File

@ -0,0 +1,32 @@
// 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;
std::function<std::tr1::shared_ptr<int>()> funcr = std::ref(test);
void test2(std::tr1::shared_ptr<int>) { }
std::function<void(std::tr1::shared_ptr<int>)> func2 = std::ref(test2);