diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-10-05 18:48:55 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-10-05 18:48:55 -0700 |
| commit | 78b569f68540c5609388864bd805dcf21dd6a187 (patch) | |
| tree | 0a5757bb11834d0109f99310f4493dfd63579901 /unsupported/Eigen/CXX11/src/util/EmulateArray.h | |
| parent | 9c2b6c049be19fd4c571b0df537169d277b26291 (diff) | |
| parent | 4387433acf9cd2eab3713349163cd1e8905b5854 (diff) | |
Merged latest updates from trunk
Diffstat (limited to 'unsupported/Eigen/CXX11/src/util/EmulateArray.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/util/EmulateArray.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/util/EmulateArray.h b/unsupported/Eigen/CXX11/src/util/EmulateArray.h index 24159e54c..30d3ebcff 100644 --- a/unsupported/Eigen/CXX11/src/util/EmulateArray.h +++ b/unsupported/Eigen/CXX11/src/util/EmulateArray.h @@ -117,7 +117,7 @@ template <typename T, size_t n> class array { values[7] = v8; } -#ifdef EIGEN_HAS_VARIADIC_TEMPLATES +#if EIGEN_HAS_VARIADIC_TEMPLATES EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE array(std::initializer_list<T> l) { eigen_assert(l.size() == n); @@ -167,7 +167,7 @@ template <typename T> class array<T, 0> { EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE array() : dummy() { } -#ifdef EIGEN_HAS_VARIADIC_TEMPLATES +#if EIGEN_HAS_VARIADIC_TEMPLATES EIGEN_DEVICE_FUNC array(std::initializer_list<T> l) : dummy() { eigen_assert(l.size() == 0); } |