diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-10 14:34:42 -0800 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-10 14:34:42 -0800 |
| commit | 6620aaa4b3ad3ae9f38b7b6213e874021579bcd7 (patch) | |
| tree | e6c35b68f9f08a494f40a1ef4fbf55588031586f /unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h | |
| parent | f669f5656ab550010c5dd92ce2da7d3fab07babd (diff) | |
Silenced a few compilation warnings generated by nvcc
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h b/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h index 57a14a037..a1dec76d1 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h @@ -240,7 +240,7 @@ struct TensorEvaluator<const TensorConcatenationOp<Axis, LeftArgType, RightArgTy return rslt; } - Scalar* data() const { return NULL; } + EIGEN_DEVICE_FUNC Scalar* data() const { return NULL; } protected: Dimensions m_dimensions; |