diff options
author | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2014-10-16 14:52:50 -0700 |
---|---|---|
committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2014-10-16 14:52:50 -0700 |
commit | ae697b471c0d3961ebdb633e30046e5fe31fbe24 (patch) | |
tree | 3ab599542dd7a49f0cf033688874c880f5e5305a /unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h | |
parent | 94e47798f4e462b857a00b4ca60c954c71d16605 (diff) |
Silenced a few compilation warnings
Generalized a TensorMap constructor
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h')
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h b/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h index b8e43f484..74485b15b 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h @@ -140,7 +140,7 @@ struct TensorEvaluator<const TensorConcatenationOp<Axis, LeftArgType, RightArgTy EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Dimensions& dimensions() const { return m_dimensions; } // TODO(phli): Add short-circuit memcpy evaluation if underlying data are linear? - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE bool evalSubExprsIfNeeded(Scalar* data) + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE bool evalSubExprsIfNeeded(Scalar* /*data*/) { m_leftImpl.evalSubExprsIfNeeded(NULL); m_rightImpl.evalSubExprsIfNeeded(NULL); @@ -202,13 +202,13 @@ struct TensorEvaluator<const TensorConcatenationOp<Axis, LeftArgType, RightArgTy Scalar* data() const { return NULL; } protected: - const Axis m_axis; Dimensions m_dimensions; array<Index, NumDims> m_outputStrides; array<Index, NumDims> m_leftStrides; array<Index, NumDims> m_rightStrides; TensorEvaluator<LeftArgType, Device> m_leftImpl; TensorEvaluator<RightArgType, Device> m_rightImpl; + const Axis m_axis; }; |