Remove unnecessary typedef from std::function

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

From-SVN: r244107

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e51ab1707508fb1c142b909a9af74452a34a5914..7b2199d52c7f849b71b558cb5476bbe70c8998e2 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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

diff --git a/libstdc++-v3/include/bits/std_function.h b/libstdc++-v3/include/bits/std_function.h
index 7b10c42e0b210864ef578e752557305c334b52c6..f7bb22a313e5930ee90c22fa091d0aec63ca46f2 100644 (file)
--- a/libstdc++-v3/include/bits/std_function.h
+++ b/libstdc++-v3/include/bits/std_function.h
@@ -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))
          {