diff options
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/__functional_03 | 6 | ||||
| -rw-r--r-- | libcxx/include/functional | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/libcxx/include/__functional_03 b/libcxx/include/__functional_03 index 99354834234..13c38d8548d 100644 --- a/libcxx/include/__functional_03 +++ b/libcxx/include/__functional_03 @@ -2091,14 +2091,16 @@ public: result_type operator()(_Args&& ...__args) { - return base::operator()(_VSTD::forward<_Args>(__args)...); + typedef __invoke_void_return_wrapper<_Rp> _Invoker; + return _Invoker::__call(static_cast<base&>(*this), _VSTD::forward<_Args>(__args)...); } template <class ..._Args> result_type operator()(_Args&& ...__args) const { - return base::operator()(_VSTD::forward<_Args>(__args)...); + typedef __invoke_void_return_wrapper<_Rp> _Invoker; + return _Invoker::__call(static_cast<base const&>(*this), _VSTD::forward<_Args>(__args)...); } }; diff --git a/libcxx/include/functional b/libcxx/include/functional index 7a9d68d3c3d..90972bce7a6 100644 --- a/libcxx/include/functional +++ b/libcxx/include/functional @@ -2186,12 +2186,13 @@ public: typename enable_if < is_convertible<typename __bind_return<_Fd, _Td, tuple<_Args&&...> >::type, - result_type>::value, + result_type>::value || is_void<_Rp>::value, result_type >::type operator()(_Args&& ...__args) { - return base::operator()(_VSTD::forward<_Args>(__args)...); + typedef __invoke_void_return_wrapper<_Rp> _Invoker; + return _Invoker::__call(static_cast<base&>(*this), _VSTD::forward<_Args>(__args)...); } template <class ..._Args> @@ -2199,12 +2200,13 @@ public: typename enable_if < is_convertible<typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type, - result_type>::value, + result_type>::value || is_void<_Rp>::value, result_type >::type operator()(_Args&& ...__args) const { - return base::operator()(_VSTD::forward<_Args>(__args)...); + typedef __invoke_void_return_wrapper<_Rp> _Invoker; + return _Invoker::__call(static_cast<base const&>(*this), _VSTD::forward<_Args>(__args)...); } }; |
