diff options
| author |  Eugene Zhulenev <ezhulenev@google.com> | 2019-09-25 11:25:22 -0700 |
|---|---|---|
| committer | Eugene Zhulenev <ezhulenev@google.com> | 2019-09-25 11:25:22 -0700 |
| commit | 71d5bedf7224c4c2a2abb783a7cb5a60121b1ccb (patch) | |
| tree | e868f6e11918c98dc8e2c8867b96fe04696f7217 /unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h | |
| parent | 5e186b1987b8b17075b4e36a290b7e9f69cc81cb (diff) | |
Fix compilation warnings and errors with clang in TensorBlockV2
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h b/unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h index f33489a33..802cf21d8 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h @@ -171,10 +171,6 @@ enum TiledEvaluation { template <typename Device, typename Expression> struct IsTileable { -#if !EIGEN_HAS_CXX11 - typedef TiledEvaluation::TiledEvaluation TiledEvaluation; -#endif - // Check that block evaluation is supported and it's a preferred option (at // least one sub-expression has much faster block evaluation, e.g. // broadcasting). @@ -186,11 +182,17 @@ struct IsTileable { TensorEvaluator<Expression, Device>::BlockAccessV2 && TensorEvaluator<Expression, Device>::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 |