From 668ab3fc474e54c7919eda4fbaf11f3a99246494 Mon Sep 17 00:00:00 2001 From: Rasmus Munk Larsen Date: Fri, 18 Oct 2019 16:42:00 -0700 Subject: Drop support for c++03 in Eigen tensor. Get rid of some code used to emulate c++11 functionality with older compilers. --- .../CXX11/src/Tensor/TensorForwardDeclarations.h | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h') diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h b/unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h index 802cf21d8..5549cbdb2 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h @@ -155,19 +155,11 @@ struct IsVectorizable { }; // Tiled evaluation strategy. -#if !EIGEN_HAS_CXX11 -// To be able to use `TiledEvaluation::Off` in C++03 we need a namespace. -// (Use of enumeration in a nested name specifier is a c++11 extension). -namespace TiledEvaluation { -#endif enum TiledEvaluation { Off = 0, // tiled evaluation is not supported On = 1, // still work in progress (see TensorBlockV2.h) Legacy = 2 // soon to be deprecated (see TensorBock.h) }; -#if !EIGEN_HAS_CXX11 -} // namespace TiledEvaluation -#endif template struct IsTileable { @@ -182,30 +174,16 @@ struct IsTileable { TensorEvaluator::BlockAccessV2 && TensorEvaluator::PreferBlockAccess; -#if EIGEN_HAS_CXX11 static const TiledEvaluation value = BlockAccessV2 ? TiledEvaluation::On : (BlockAccess ? TiledEvaluation::Legacy : TiledEvaluation::Off); -#else - static const TiledEvaluation::TiledEvaluation value = - BlockAccessV2 - ? TiledEvaluation::On - : (BlockAccess ? TiledEvaluation::Legacy : TiledEvaluation::Off); -#endif }; -#if EIGEN_HAS_CXX11 template ::value, TiledEvaluation Tiling = IsTileable::value> class TensorExecutor; -#else -template ::value, - TiledEvaluation::TiledEvaluation Tiling = IsTileable::value> -class TensorExecutor; -#endif // TODO(ezhulenev): Add TiledEvaluation support to async executor. template