diff options
Diffstat (limited to 'llvm/include/llvm/ADT/STLExtras.h')
| -rw-r--r-- | llvm/include/llvm/ADT/STLExtras.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/llvm/include/llvm/ADT/STLExtras.h b/llvm/include/llvm/ADT/STLExtras.h index e0d06f9f94a..3eae7061a40 100644 --- a/llvm/include/llvm/ADT/STLExtras.h +++ b/llvm/include/llvm/ADT/STLExtras.h @@ -693,7 +693,7 @@ template <typename R> detail::enumerator_impl<R> enumerate(R &&Range) { namespace detail { template <typename F, typename Tuple, std::size_t... I> -auto apply_impl(F &&f, Tuple &&t, index_sequence<I...>) +auto apply_tuple_impl(F &&f, Tuple &&t, index_sequence<I...>) -> decltype(std::forward<F>(f)(std::get<I>(std::forward<Tuple>(t))...)) { return std::forward<F>(f)(std::get<I>(std::forward<Tuple>(t))...); } @@ -703,15 +703,15 @@ auto apply_impl(F &&f, Tuple &&t, index_sequence<I...>) /// tuple variadically to f as if by calling f(a1, a2, ..., an) and /// return the result. template <typename F, typename Tuple> -auto apply(F &&f, Tuple &&t) -> decltype(detail::apply_impl( +auto apply_tuple(F &&f, Tuple &&t) -> decltype(detail::apply_tuple_impl( std::forward<F>(f), std::forward<Tuple>(t), build_index_impl< - std::tuple_size<typename std::decay<Tuple>::type>::value>())) { + std::tuple_size<typename std::decay<Tuple>::type>::value>{})) { using Indices = build_index_impl< std::tuple_size<typename std::decay<Tuple>::type>::value>; - return detail::apply_impl(std::forward<F>(f), std::forward<Tuple>(t), - Indices()); + return detail::apply_tuple_impl(std::forward<F>(f), std::forward<Tuple>(t), + Indices{}); } } // End llvm namespace |
