diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-11-02 02:56:58 +0000 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-11-02 02:56:58 +0000 |
| commit | e44519744e6a788c12e572d654bb21de6bdf5684 (patch) | |
| tree | a55215d0b2a5a166fcccb4916787ea728852d7a1 /unsupported | |
| parent | 0a6ae4155597c9df28cac36b6fdfdcf70d70bf00 (diff) | |
| parent | 51af6ae971aeac425caad147b0ce9f31af0d7cf6 (diff) | |
Merged in benoitsteiner/opencl (pull request PR-243)
Fixed the ambiguity in callig make_tuple for sycl backend.
Diffstat (limited to 'unsupported')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorSyclTuple.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorSyclTuple.h b/unsupported/Eigen/CXX11/src/Tensor/TensorSyclTuple.h index b443ebe1d..063b027e8 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorSyclTuple.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorSyclTuple.h @@ -105,7 +105,7 @@ TERMINATE_CONDS_TUPLE_GET() template <size_t k, class T, class... Ts> \ typename StaticIf<k != 0, CVQual typename ElemTypeHolder<k, Tuple<T, Ts...> >::type &>::type \ 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() @@ -182,7 +182,7 @@ struct IndexRange: RangeBuilder<MIN, MAX>::type {}; /// \return Tuple<Args..., T> template <typename... Args, typename T, size_t... 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 @@ -195,7 +195,7 @@ Tuple<Args..., T> append_base(Tuple<Args...> t, T a,IndexList<I...>) { /// \return Tuple<Args..., T> template <typename... Args, typename T> 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 @@ -213,7 +213,7 @@ Tuple<Args..., T> append(Tuple<Args...> t, T a) { /// \return Tuple<Args1..., Args2...> 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...>) { - return make_tuple(get<I1>(t1)...,get<I2>(t2)...); + return utility::tuple::make_tuple(get<I1>(t1)...,get<I2>(t2)...); } /// append @@ -227,7 +227,7 @@ Tuple<Args1..., Args2...> append_base(Tuple<Args1...> t1, Tuple<Args2...> t2, In /// \return Tuple<Args1..., Args2...> template <typename... Args1, typename... Args2> 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 } // utility |