diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2014-06-24 00:46:19 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2014-06-24 00:46:19 +0000 |
| commit | ba6dbf486612e6bc312a231e78f5e132e0519d70 (patch) | |
| tree | 5dcc7a2cea76193a835542b7e64d5265f639c28e /include/__functional_03 | |
| parent | e4694b41295484e5c521d2c281de9330c6d60c79 (diff) | |
Some calls to get<>() were qualified. Some were not. Qualify them all. Fixes bug #20092. Thanks to Agustín Bergé for the bug report and the fix.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@211563 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/__functional_03')
| -rw-r--r-- | include/__functional_03 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/__functional_03 b/include/__functional_03 index 258260173..540268760 100644 --- a/include/__functional_03 +++ b/include/__functional_03 @@ -1911,7 +1911,7 @@ inline _LIBCPP_INLINE_VISIBILITY typename __mu_return1<true, _Ti, _Uj...>::type __mu_expand(_Ti& __ti, tuple<_Uj...>&& __uj, __tuple_indices<_Indx...>) { - __ti(_VSTD::forward<typename tuple_element<_Indx, _Uj>::type>(get<_Indx>(__uj))...); + __ti(_VSTD::forward<typename tuple_element<_Indx, _Uj>::type>(_VSTD::get<_Indx>(__uj))...); } template <class _Ti, class ..._Uj> @@ -1947,9 +1947,9 @@ __mu(_Ti&, _Uj& __uj) { const size_t _Indx = is_placeholder<_Ti>::value - 1; // compiler bug workaround - typename tuple_element<_Indx, _Uj>::type __t = get<_Indx>(__uj); + typename tuple_element<_Indx, _Uj>::type __t = _VSTD::get<_Indx>(__uj); return __t; -// return _VSTD::forward<typename tuple_element<_Indx, _Uj>::type>(get<_Indx>(__uj)); +// return _VSTD::forward<typename tuple_element<_Indx, _Uj>::type>(_VSTD::get<_Indx>(__uj)); } template <class _Ti, class _Uj> @@ -2040,7 +2040,7 @@ typename __bind_return<_Fp, _BoundArgs, _Args>::type __apply_functor(_Fp& __f, _BoundArgs& __bound_args, __tuple_indices<_Indx...>, _Args&& __args) { - return __invoke(__f, __mu(get<_Indx>(__bound_args), __args)...); + return __invoke(__f, __mu(_VSTD::get<_Indx>(__bound_args), __args)...); } template<class _Fp, class ..._BoundArgs> |