diff --git a/include/functional b/include/functional index aa2b4924d..03e2c8162 100644 --- a/include/functional +++ b/include/functional @@ -1567,24 +1567,31 @@ __mu(_Ti& __ti, _Uj& __uj) return __ti; } -template +template struct ____mu_return; template -struct ____mu_return<_Ti, true, false, tuple<_Uj...> > +struct ____mu_return<_Ti, false, true, false, tuple<_Uj...> > { typedef typename __invoke_of<_Ti&, _Uj...>::type type; }; template -struct ____mu_return<_Ti, false, true, _TupleUj> +struct ____mu_return<_Ti, false, false, true, _TupleUj> { typedef typename tuple_element::value - 1, _TupleUj>::type&& type; }; template -struct ____mu_return<_Ti, false, false, _TupleUj> +struct ____mu_return<_Ti, true, false, false, _TupleUj> +{ + typedef typename _Ti::type& type; +}; + +template +struct ____mu_return<_Ti, false, false, false, _TupleUj> { typedef _Ti& type; }; @@ -1592,18 +1599,13 @@ struct ____mu_return<_Ti, false, false, _TupleUj> template struct __mu_return : public ____mu_return<_Ti, + __is_reference_wrapper<_Ti>::value, is_bind_expression<_Ti>::value, 0 < is_placeholder<_Ti>::value, _TupleUj> { }; -template -struct __mu_return, _TupleUj> -{ - typedef _Ti& type; -}; - template struct __bind_return;