diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-05-08 17:13:34 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-05-08 17:13:34 +0000 |
| commit | 733153a0fb52facba02c550ec849f0c734dfa412 (patch) | |
| tree | 8f249e8b8f6a7803a81bb0fed33213b9249b7ac1 /include/functional | |
| parent | 2fa809d9eabddd820af54059faa8362dd50b51de (diff) | |
| download | src-733153a0fb52facba02c550ec849f0c734dfa412.tar.gz src-733153a0fb52facba02c550ec849f0c734dfa412.zip | |
Vendor import of libc++ trunk r302418:vendor/libc++/libc++-trunk-r302418
Notes
Notes:
svn path=/vendor/libc++/dist/; revision=317955
svn path=/vendor/libc++/libc++-trunk-r302418/; revision=317956; tag=vendor/libc++/libc++-trunk-r302418
Diffstat (limited to 'include/functional')
| -rw-r--r-- | include/functional | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/functional b/include/functional index 386fe678bff3..ea35697d3bbf 100644 --- a/include/functional +++ b/include/functional @@ -2224,7 +2224,7 @@ typename __bind_return<_Fp, _BoundArgs, _Args>::type __apply_functor(_Fp& __f, _BoundArgs& __bound_args, __tuple_indices<_Indx...>, _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> @@ -2257,7 +2257,7 @@ public: typename __bind_return<_Fd, _Td, tuple<_Args&&...> >::type operator()(_Args&& ...__args) { - return __apply_functor(__f_, __bound_args_, __indices(), + return _VSTD::__apply_functor(__f_, __bound_args_, __indices(), tuple<_Args&&...>(_VSTD::forward<_Args>(__args)...)); } @@ -2266,7 +2266,7 @@ public: typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type 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)...)); } }; |