From 780b2422e2b3fd2b50121a6e5642c94b030fbf5b Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Tue, 10 Feb 2015 12:43:55 -0800 Subject: Silenced the last batch of compilation warnings triggered by gcc 4.8 --- unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h') diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h b/unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h index 585ebc778..bf0e7edfb 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorImagePatch.h @@ -121,7 +121,7 @@ struct TensorEvaluator, Device> : m_impl(op.expression(), device) { // Only column major tensors are supported for now. - EIGEN_STATIC_ASSERT((Layout == ColMajor), YOU_MADE_A_PROGRAMMING_MISTAKE); + EIGEN_STATIC_ASSERT((static_cast(Layout) == static_cast(ColMajor)), YOU_MADE_A_PROGRAMMING_MISTAKE); EIGEN_STATIC_ASSERT(NumDims >= 4, YOU_MADE_A_PROGRAMMING_MISTAKE); @@ -295,7 +295,7 @@ struct TensorEvaluator, Device> return packetWithPossibleZero(index); } - Scalar* data() const { return NULL; } + EIGEN_DEVICE_FUNC Scalar* data() const { return NULL; } const TensorEvaluator& impl() const { return m_impl; } -- cgit v1.2.3