From 51af6ae971aeac425caad147b0ce9f31af0d7cf6 Mon Sep 17 00:00:00 2001 From: Mehdi Goli Date: Mon, 31 Oct 2016 16:35:51 +0000 Subject: [PATCH] Fixed the ambiguity in callig make_tuple for sycl backend. --- unsupported/Eigen/CXX11/src/Tensor/TensorSyclTuple.h | 10 +++++----- 1 file 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 \ typename StaticIf >::type &>::type \ get(CVQual Tuple &t) { \ - return get(t.tail); \ + return utility::tuple::get(t.tail); \ } RECURSIVE_TUPLE_GET(const) RECURSIVE_TUPLE_GET() @@ -182,7 +182,7 @@ struct IndexRange: RangeBuilder::type {}; /// \return Tuple template Tuple append_base(Tuple t, T a,IndexList) { - return make_tuple(get(t)..., a); + return utility::tuple::make_tuple(get(t)..., a); } /// append @@ -195,7 +195,7 @@ Tuple append_base(Tuple t, T a,IndexList) { /// \return Tuple template Tuple append(Tuple 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 append(Tuple t, T a) { /// \return Tuple template Tuple append_base(Tuple t1, Tuple t2, IndexList, IndexList) { - return make_tuple(get(t1)...,get(t2)...); + return utility::tuple::make_tuple(get(t1)...,get(t2)...); } /// append @@ -227,7 +227,7 @@ Tuple append_base(Tuple t1, Tuple t2, In /// \return Tuple template Tuple append(Tuple t1,Tuple 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