GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-04-29 23:34:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the ambiguity in callig make_tuple for sycl backend.

Browse Source
This commit is contained in:
Mehdi Goli 2016-10-31 16:35:51 +00:00
parent 0a9ad6fc72
commit 51af6ae971
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
unsupported/Eigen/CXX11/src/Tensor/TensorSyclTuple.h
View File

@ -105,7 +105,7 @@ TERMINATE_CONDS_TUPLE_GET()
template <size_t k, class T, class... Ts> \ template <size_t k, class T, class... Ts> \
typename StaticIf<k != 0, CVQual typename ElemTypeHolder<k, Tuple<T, Ts...> >::type &>::type \ typename StaticIf<k != 0, CVQual typename ElemTypeHolder<k, Tuple<T, Ts...> >::type &>::type \
get(CVQual Tuple<T, Ts...> &t) { \ get(CVQual Tuple<T, Ts...> &t) { \
return get<k - 1>(t.tail); \ return utility::tuple::get<k - 1>(t.tail); \
} }
RECURSIVE_TUPLE_GET(const) RECURSIVE_TUPLE_GET(const)
RECURSIVE_TUPLE_GET() RECURSIVE_TUPLE_GET()
@ -182,7 +182,7 @@ struct IndexRange: RangeBuilder<MIN, MAX>::type {};
/// \return Tuple<Args..., T> /// \return Tuple<Args..., T>
template <typename... Args, typename T, size_t... I> template <typename... Args, typename T, size_t... I>
Tuple<Args..., T> append_base(Tuple<Args...> t, T a,IndexList<I...>) { Tuple<Args..., T> append_base(Tuple<Args...> t, T a,IndexList<I...>) {
return make_tuple(get<I>(t)..., a); return utility::tuple::make_tuple(get<I>(t)..., a);
} }
/// append /// append
@ -195,7 +195,7 @@ Tuple<Args..., T> append_base(Tuple<Args...> t, T a,IndexList<I...>) {
/// \return Tuple<Args..., T> /// \return Tuple<Args..., T>
template <typename... Args, typename T> template <typename... Args, typename T>
Tuple<Args..., T> append(Tuple<Args...> t, T a) { Tuple<Args..., T> append(Tuple<Args...> t, T a) {
return append_base(t, a, IndexRange<0, sizeof...(Args)>()); return utility::tuple::append_base(t, a, IndexRange<0, sizeof...(Args)>());
} }
/// append_base /// append_base
@ -213,7 +213,7 @@ Tuple<Args..., T> append(Tuple<Args...> t, T a) {
/// \return Tuple<Args1..., Args2...> /// \return Tuple<Args1..., Args2...>
template <typename... Args1, typename... Args2, size_t... I1, size_t... I2> template <typename... Args1, typename... Args2, size_t... I1, size_t... I2>
Tuple<Args1..., Args2...> append_base(Tuple<Args1...> t1, Tuple<Args2...> t2, IndexList<I1...>, IndexList<I2...>) { Tuple<Args1..., Args2...> append_base(Tuple<Args1...> t1, Tuple<Args2...> t2, IndexList<I1...>, IndexList<I2...>) {
return make_tuple(get<I1>(t1)...,get<I2>(t2)...); return utility::tuple::make_tuple(get<I1>(t1)...,get<I2>(t2)...);
} }
/// append /// append
@ -227,7 +227,7 @@ Tuple<Args1..., Args2...> append_base(Tuple<Args1...> t1, Tuple<Args2...> t2, In
/// \return Tuple<Args1..., Args2...> /// \return Tuple<Args1..., Args2...>
template <typename... Args1, typename... Args2> template <typename... Args1, typename... Args2>
Tuple<Args1..., Args2...> append(Tuple<Args1...> t1,Tuple<Args2...> t2) { Tuple<Args1..., Args2...> append(Tuple<Args1...> t1,Tuple<Args2...> t2) {
return append_base(t1, t2, IndexRange<0, sizeof...(Args1)>(), IndexRange<0, sizeof...(Args2)>()); return utility::tuple::append_base(t1, t2, IndexRange<0, sizeof...(Args1)>(), IndexRange<0, sizeof...(Args2)>());
} }
} // tuple } // tuple
} // utility } // utility