Skip to content

Commit 33e61ff

Browse files
authored
[SYCL][NFC] Fix potential namespace conflicts with PSTL in tuple.hpp (#3541)
Signed-off-by: Vyacheslav N Klochkov <[email protected]>
1 parent 6a49170 commit 33e61ff

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

sycl/include/CL/sycl/detail/tuple.hpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ std::tuple<Ts...> get_tuple_tail_impl(const std::tuple<T, Ts...> &Tuple,
2929

3030
template <typename T, typename... Ts>
3131
std::tuple<Ts...> get_tuple_tail(const std::tuple<T, Ts...> &Tuple) {
32-
return get_tuple_tail_impl(Tuple, std::make_index_sequence<sizeof...(Ts)>());
32+
return sycl::detail::get_tuple_tail_impl(
33+
Tuple, std::make_index_sequence<sizeof...(Ts)>());
3334
}
3435

3536
template <typename... Ts> constexpr tuple<Ts...> make_tuple(Ts... Args) {
@@ -127,7 +128,7 @@ template <typename T, typename... Ts> struct tuple<T, Ts...> {
127128

128129
// required to convert std::tuple to inner tuple in user-provided functor
129130
tuple(const std::tuple<T, Ts...> &RHS)
130-
: holder(std::get<0>(RHS)), next(get_tuple_tail(RHS)) {}
131+
: holder(std::get<0>(RHS)), next(sycl::detail::get_tuple_tail(RHS)) {}
131132

132133
// Convert to std::tuple with the same template arguments.
133134
operator std::tuple<T, Ts...>() const {
@@ -157,7 +158,7 @@ template <typename T, typename... Ts> struct tuple<T, Ts...> {
157158
template <typename UT, typename... UTs>
158159
tuple &operator=(const std::tuple<UT, UTs...> &RHS) {
159160
holder.value = std::get<0>(RHS);
160-
next = get_tuple_tail(RHS);
161+
next = sycl::detail::get_tuple_tail(RHS);
161162
return *this;
162163
}
163164

0 commit comments

Comments
 (0)