diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-05-25 15:15:12 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-05-25 15:15:12 -0700 |
| commit | 3ac40452727a837f55aa1f3f484d5e8c52d6d769 (patch) | |
| tree | f2d9739de4b45ce7c58579a16adf661140df7052 /unsupported/Eigen/CXX11 | |
| parent | 66556d0e05546107d4619ea4de66d1c8aa184259 (diff) | |
Made the IndexPair code compile in non cxx11 mode
Diffstat (limited to 'unsupported/Eigen/CXX11')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h b/unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h index 9ae97ba42..b1645d56f 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorMeta.h @@ -114,8 +114,8 @@ bool operator!=(const Tuple<U, V>& x, const Tuple<U, V>& y) { // Can't use std::pairs on cuda devices template <typename Idx> struct IndexPair { - constexpr EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE IndexPair() : first(0), second(0) {} - constexpr EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE IndexPair(Idx f, Idx s) : first(f), second(s) {} + EIGEN_CONSTEXPR EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE IndexPair() : first(0), second(0) {} + EIGEN_CONSTEXPR EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE IndexPair(Idx f, Idx s) : first(f), second(s) {} EIGEN_DEVICE_FUNC void set(IndexPair<Idx> val) { first = val.first; |