aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2016-01-22 19:11:31 -0800
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2016-01-22 19:11:31 -0800
commitcb4e53ff7ff8d49bccc09b41efc193fb64d37a32 (patch)
treef479ad72641179eb8b90e9387c0debe94c7a286d /unsupported
parent3aeeca32af00b1921b4424d7be2e03bbaeaa05b4 (diff)
parent9f94e030c1c0f334de812cd5220dbb95a0a1e145 (diff)
Merged in ville-k/eigen/tensorflow_fix (pull request PR-153)
Add ctor for long
Diffstat (limited to 'unsupported')
-rw-r--r--unsupported/Eigen/CXX11/src/Tensor/TensorUInt128.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorUInt128.h b/unsupported/Eigen/CXX11/src/Tensor/TensorUInt128.h
index 4f2adb671..f43f64cde 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorUInt128.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorUInt128.h
@@ -34,11 +34,11 @@ struct TensorUInt128
LOW low;
EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE
- TensorUInt128(int x) : high(0), low(x) {
+ TensorUInt128(int32_t x) : high(0), low(x) {
eigen_assert(x >= 0);
}
EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE
- TensorUInt128(unsigned int x) : high(0), low(x) { }
+ TensorUInt128(uint32_t x) : high(0), low(x) { }
EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE
TensorUInt128(int64_t x) : high(0), low(x) {
eigen_assert(x >= 0);