From 6585efc55354b38c65de8c23599e99f3caaca843 Mon Sep 17 00:00:00 2001
From: Benoit Steiner <benoit.steiner.goog@gmail.com>
Date: Wed, 14 Oct 2015 09:31:37 -0700
Subject: Tightened the definition of isOfNormalIndex to take into account
 integer types in addition to arrays of indices Only compile the custom index
 code  when EIGEN_HAS_SFINAE is defined. For the time beeing, EIGEN_HAS_SFINAE
 is a synonym for EIGEN_HAS_VARIADIC_TEMPLATES, but this might evolve in the
 future. Moved some code around.

---
 unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h')

diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h b/unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h
index 01aedd3c9..d1efc1a87 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h
@@ -32,17 +32,6 @@ template <> struct max_n_1<0> {
 };
 
 
-
-
-
-
-
-#if defined(EIGEN_HAS_CONSTEXPR)
-#define EIGEN_CONSTEXPR constexpr
-#else
-#define EIGEN_CONSTEXPR
-#endif
-
 // Tuple mimics std::pair but works on e.g. nvcc.
 template <typename U, typename V> struct Tuple {
  public:
@@ -88,7 +77,7 @@ bool operator!=(const Tuple<U, V>& x, const Tuple<U, V>& y) {
 
 
 
-
+#ifdef EIGEN_HAS_SFINAE
 namespace internal{
 
   template<typename IndexType, Index... Is>
@@ -127,15 +116,10 @@ namespace internal{
   };
 
 }
+#endif
 
 
 
-
-
-
-
-#undef EIGEN_CONSTEXPR
-
 }  // namespace Eigen
 
 #endif  // EIGEN_CXX11_TENSOR_TENSOR_META_H
-- 
cgit v1.2.3