aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2016-01-08 16:38:14 -0800
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2016-01-08 16:38:14 -0800
commitd726e864ac91a1b5d5128972ee9e169966f2fa51 (patch)
treec499991c136e61f243863b74896e614e870234fd /unsupported
parent3358dfd5dd6c98fda9be133d1c4958ac00221006 (diff)
Made it possible to use array of size 0 on CUDA devices
Diffstat (limited to 'unsupported')
-rw-r--r--unsupported/Eigen/CXX11/src/Core/util/EmulateArray.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Core/util/EmulateArray.h b/unsupported/Eigen/CXX11/src/Core/util/EmulateArray.h
index ab9c2ec3e..456b34d0b 100644
--- a/unsupported/Eigen/CXX11/src/Core/util/EmulateArray.h
+++ b/unsupported/Eigen/CXX11/src/Core/util/EmulateArray.h
@@ -132,13 +132,13 @@ template <typename T> class array<T, 0> {
return *static_cast<const T*>(NULL);
}
- static EIGEN_ALWAYS_INLINE std::size_t size() { return 0; }
+ static EIGEN_DEVICE_FUNC EIGEN_ALWAYS_INLINE std::size_t size() { return 0; }
EIGEN_DEVICE_FUNC
EIGEN_STRONG_INLINE array() { }
#ifdef EIGEN_HAS_VARIADIC_TEMPLATES
- array(std::initializer_list<T> l) {
+ EIGEN_DEVICE_FUNC array(std::initializer_list<T> l) {
eigen_assert(l.size() == 0);
}
#endif