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

From-SVN: r217065
This commit is contained in:
Jonathan Wakely 2014-11-04 02:49:27 +00:00 committed by Jonathan Wakely
parent 8a57bed1d6
commit 9bcb72e0b0
2 changed files with 5 additions and 12 deletions

View File

@ -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

View File

@ -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...>)