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

Remove unnecessary typedef from std::function

Browse Source 
* include/bits/std_function.h (function::_Signature_type): Remove.
	(function::function(_Functor)): Adjust.

From-SVN: r244107
This commit is contained in:
Jonathan Wakely 2017-01-05 17:35:49 +00:00 committed by Jonathan Wakely
parent 205d711133
commit 295ce2e534
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2017-01-05 Jonathan Wakely <jwakely@redhat.com>
* include/bits/std_function.h (function::_Signature_type): Remove.
(function::function(_Functor)): Adjust.
2017-01-05 Tim Shen <timshen@google.com>
PR libstdc++/78996

4
libstdc++-v3/include/bits/std_function.h
View File

@ -456,8 +456,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
: public _Maybe_unary_or_binary_function<_Res, _ArgTypes...>,
private _Function_base
{
typedef _Res _Signature_type(_ArgTypes...);
template<typename _Func,
typename _Res2 = typename result_of<_Func&(_ArgTypes...)>::type>
struct _Callable : __check_func_return_type<_Res2, _Res> { };
@ -715,7 +713,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
function(_Functor __f)
: _Function_base()
{
typedef _Function_handler<_Signature_type, _Functor> _My_handler;
typedef _Function_handler<_Res(_ArgTypes...), _Functor> _My_handler;
if (_My_handler::_M_not_empty_function(__f))
{