diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-11-04 02:49:27 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-11-04 02:49:27 +0000 |
| commit | 9bcb72e0b001525a25370716da57a1d48a8922f4 (patch) | |
| tree | d5763af9a539eb814c8bbf5bcbcf7e524de8ea79 /libstdc++-v3 | |
| parent | 8a57bed1d656c7875f16d69ac50a9c55f66ba3e4 (diff) | |
| download | gcc-9bcb72e0b001525a25370716da57a1d48a8922f4.zip gcc-9bcb72e0b001525a25370716da57a1d48a8922f4.tar.gz gcc-9bcb72e0b001525a25370716da57a1d48a8922f4.tar.bz2 | |
* include/std/functional (_Bind_simple): Simplify construction.
From-SVN: r217065
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/functional | 15 |
2 files changed, 5 insertions, 12 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 88e9352..c8e2ef2 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 f615ae4..f8e9b54 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...>) |