LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qualify calls to __invoke, __apply_fuctor, and __mu

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@302082 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2017-05-03 21:02:19 +00:00
parent 57c405955f
commit 6cff9cfbcc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/functional
View File

@@ -2224,7 +2224,7 @@ typename __bind_return<_Fp, _BoundArgs, _Args>::type
__apply_functor(_Fp& __f, _BoundArgs& __bound_args, __tuple_indices<_Indx...>, __apply_functor(_Fp& __f, _BoundArgs& __bound_args, __tuple_indices<_Indx...>,
_Args&& __args) _Args&& __args)
{ {
return __invoke(__f, __mu(_VSTD::get<_Indx>(__bound_args), __args)...); return _VSTD::__invoke(__f, _VSTD::__mu(_VSTD::get<_Indx>(__bound_args), __args)...);
} }
template<class _Fp, class ..._BoundArgs> template<class _Fp, class ..._BoundArgs>
@@ -2257,7 +2257,7 @@ public:
typename __bind_return<_Fd, _Td, tuple<_Args&&...> >::type typename __bind_return<_Fd, _Td, tuple<_Args&&...> >::type
operator()(_Args&& ...__args) operator()(_Args&& ...__args)
{ {
return __apply_functor(__f_, __bound_args_, __indices(), return _VSTD::__apply_functor(__f_, __bound_args_, __indices(),
tuple<_Args&&...>(_VSTD::forward<_Args>(__args)...)); tuple<_Args&&...>(_VSTD::forward<_Args>(__args)...));
} }
@@ -2266,7 +2266,7 @@ public:
typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type
operator()(_Args&& ...__args) const operator()(_Args&& ...__args) const
{ {
return __apply_functor(__f_, __bound_args_, __indices(), return _VSTD::__apply_functor(__f_, __bound_args_, __indices(),
tuple<_Args&&...>(_VSTD::forward<_Args>(__args)...)); tuple<_Args&&...>(_VSTD::forward<_Args>(__args)...));
} }
}; };