From e633a8371f0e2785c278f0e0570434f70d8a1b55 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <benoit.steiner.goog@gmail.com>
Date: Wed, 30 Nov 2016 20:21:18 -0800
Subject: [PATCH] Simplified includes

---
 unsupported/Eigen/CXX11/Tensor                       | 2 --
 unsupported/Eigen/CXX11/src/Tensor/TensorSycl.h      | 2 ++
 unsupported/Eigen/CXX11/src/Tensor/TensorSyclTuple.h | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/unsupported/Eigen/CXX11/Tensor b/unsupported/Eigen/CXX11/Tensor
index 2ee9e11a9..8b36093f0 100644
--- a/unsupported/Eigen/CXX11/Tensor
+++ b/unsupported/Eigen/CXX11/Tensor
@@ -82,8 +82,6 @@ typedef unsigned __int64 uint64_t;
 #endif
 #endif
 
-// tuple construction
-#include "src/Tensor/TensorSyclTuple.h"
 #include "src/Tensor/TensorMacros.h"
 #include "src/Tensor/TensorForwardDeclarations.h"
 #include "src/Tensor/TensorMeta.h"
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorSycl.h b/unsupported/Eigen/CXX11/src/Tensor/TensorSycl.h
index c099cb42e..e9cef0eae 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorSycl.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorSycl.h
@@ -47,6 +47,8 @@ template<typename T> struct GetType<false, T>{
 }
 }
 
+// tuple construction
+#include "TensorSyclTuple.h"
 
 // counting number of leaf at compile time
 #include "TensorSyclLeafCount.h"
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorSyclTuple.h b/unsupported/Eigen/CXX11/src/Tensor/TensorSyclTuple.h
index c0e48524d..58ab0f0d5 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorSyclTuple.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorSyclTuple.h
@@ -20,7 +20,6 @@
 
 #ifndef UNSUPPORTED_EIGEN_CXX11_SRC_TENSOR_TENSORSYCL_TUPLE_HPP
 #define UNSUPPORTED_EIGEN_CXX11_SRC_TENSOR_TENSORSYCL_TUPLE_HPP
-#ifdef EIGEN_USE_SYCL
 
 namespace utility {
 namespace tuple {
@@ -233,5 +232,5 @@ Tuple<Args1..., Args2...> append(Tuple<Args1...> t1,Tuple<Args2...> t2) {
 }
 }  // tuple
 }  // utility
-#endif //EIGEN_USE_SYCL
+
 #endif  // UNSUPPORTED_EIGEN_CXX11_SRC_TENSOR_TENSORSYCL_TUPLE_HPP