diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-10 12:43:55 -0800 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-10 12:43:55 -0800 |
| commit | 780b2422e2b3fd2b50121a6e5642c94b030fbf5b (patch) | |
| tree | d08b3130663bcc426d13a1a0fc750d976b868ac9 /unsupported/Eigen/CXX11/src/Tensor/TensorPatch.h | |
| parent | c21e45fbc5b82a2f99113e8b6ab0005ca01a7428 (diff) | |
Silenced the last batch of compilation warnings triggered by gcc 4.8
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorPatch.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorPatch.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorPatch.h b/unsupported/Eigen/CXX11/src/Tensor/TensorPatch.h index 1c03d202f..8a42ab6b1 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorPatch.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorPatch.h @@ -100,7 +100,7 @@ struct TensorEvaluator<const TensorPatchOp<PatchDim, ArgType>, 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<int>(Layout) == static_cast<int>(ColMajor)), YOU_MADE_A_PROGRAMMING_MISTAKE); Index num_patches = 1; const typename TensorEvaluator<ArgType, Device>::Dimensions& input_dims = m_impl.dimensions(); @@ -232,7 +232,7 @@ struct TensorEvaluator<const TensorPatchOp<PatchDim, ArgType>, Device> } } - Scalar* data() const { return NULL; } + EIGEN_DEVICE_FUNC Scalar* data() const { return NULL; } protected: Dimensions m_dimensions; |