diff options
| author |  David Tellenbach <david.tellenbach@me.com> | 2021-03-05 13:16:43 +0100 |
|---|---|---|
| committer | David Tellenbach <david.tellenbach@me.com> | 2021-03-05 13:16:43 +0100 |
| commit | 5f0b4a4010af4cbf6161a0d1a03a747addc44a5d (patch) | |
| tree | 23356aec10fb951fb51adf970a810e7ae18cf940 /Eigen/src/Core/Map.h | |
| parent | 6cbb3038ac48cb5fe17eba4dfbf26e3e798041f1 (diff) | |
Revert "Adds EIGEN_CONSTEXPR and EIGEN_NOEXCEPT to rows(), cols(), innerStride(), outerStride(), and size()"
This reverts commit 6cbb3038ac48cb5fe17eba4dfbf26e3e798041f1 because it
breaks clang-10 builds on x86 and aarch64 when C++11 is enabled.
Diffstat (limited to 'Eigen/src/Core/Map.h')
| -rw-r--r-- | Eigen/src/Core/Map.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Core/Map.h b/Eigen/src/Core/Map.h index 93d2ae907..c437f1a92 100644 --- a/Eigen/src/Core/Map.h +++ b/Eigen/src/Core/Map.h @@ -11,7 +11,7 @@ #ifndef EIGEN_MAP_H #define EIGEN_MAP_H -namespace Eigen { +namespace Eigen { namespace internal { template<typename PlainObjectType, int MapOptions, typename StrideType> @@ -104,13 +104,13 @@ template<typename PlainObjectType, int MapOptions, typename StrideType> class Ma EIGEN_DEVICE_FUNC inline PointerType cast_to_pointer_type(PointerArgType ptr) { return ptr; } - EIGEN_DEVICE_FUNC EIGEN_CONSTEXPR + EIGEN_DEVICE_FUNC inline Index innerStride() const { return StrideType::InnerStrideAtCompileTime != 0 ? m_stride.inner() : 1; } - EIGEN_DEVICE_FUNC EIGEN_CONSTEXPR + EIGEN_DEVICE_FUNC inline Index outerStride() const { return StrideType::OuterStrideAtCompileTime != 0 ? m_stride.outer() |