From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 4 Nov 2014 02:49:27 +0000 (+0000)
Subject: * include/std/functional (_Bind_simple): Simplify construction.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9bcb72e0b001525a25370716da57a1d48a8922f4;p=gcc.git

* include/std/functional (_Bind_simple): Simplify construction.

From-SVN: r217065
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 88e93524d2b..c8e2ef28365 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -4,6 +4,8 @@
 	* include/experimental/optional (__constexpr_addressof): Likewise.
 	(_Optional_base, optional, make_optional): Likewise.
 
+	* include/std/functional (_Bind_simple): Simplify construction.
+
 2014-11-03  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/parallel/algo.h: Do not use default arguments in function
diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional
index f615ae4ea67..f8e9b54fd91 100644
--- a/libstdc++-v3/include/std/functional
+++ b/libstdc++-v3/include/std/functional
@@ -1582,18 +1582,10 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
     {
       typedef typename result_of<_Callable(_Args...)>::type result_type;
 
-      template<typename... _Args2, typename = typename
-               enable_if< sizeof...(_Args) == sizeof...(_Args2)>::type>
+      template<typename _Tp, typename... _Up>
         explicit
-        _Bind_simple(const _Callable& __callable, _Args2&&... __args)
-        : _M_bound(__callable, std::forward<_Args2>(__args)...)
-        { }
-
-      template<typename... _Args2, typename = typename
-               enable_if< sizeof...(_Args) == sizeof...(_Args2)>::type>
-        explicit
-        _Bind_simple(_Callable&& __callable, _Args2&&... __args)
-        : _M_bound(std::move(__callable), std::forward<_Args2>(__args)...)
+        _Bind_simple(_Tp&& __f, _Up&&... __args)
+        : _M_bound(std::forward<_Tp>(__f), std::forward<_Up>(__args)...)
         { }
 
       _Bind_simple(const _Bind_simple&) = default;
@@ -1607,7 +1599,6 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
       }
 
     private:
-
       template<std::size_t... _Indices>
         typename result_of<_Callable(_Args...)>::type
         _M_invoke(_Index_tuple<_Indices...>)