diff options
author | Steve Bronder <stevo15025@gmail.com> | 2021-03-08 12:39:11 -0500 |
---|---|---|
committer | Steve Bronder <stevo15025@gmail.com> | 2021-03-24 18:14:56 +0000 |
commit | e7b8643d70dfbb02ad94186169a8f16041f05bc2 (patch) | |
tree | 8bc5cef192a8248fa7d661f097254fe1d0437750 /Eigen/src/Core/Reverse.h | |
parent | 5521c65afbddbb1ec05c06bda0fc250ece27fc7f (diff) |
Revert "Revert "Adds EIGEN_CONSTEXPR and EIGEN_NOEXCEPT to rows(), cols(), innerStride(), outerStride(), and size()""
This reverts commit 5f0b4a4010af4cbf6161a0d1a03a747addc44a5d.
Diffstat (limited to 'Eigen/src/Core/Reverse.h')
-rw-r--r-- | Eigen/src/Core/Reverse.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Eigen/src/Core/Reverse.h b/Eigen/src/Core/Reverse.h index 853093923..28cdd76ac 100644 --- a/Eigen/src/Core/Reverse.h +++ b/Eigen/src/Core/Reverse.h @@ -12,7 +12,7 @@ #ifndef EIGEN_REVERSE_H #define EIGEN_REVERSE_H -namespace Eigen { +namespace Eigen { namespace internal { @@ -44,7 +44,7 @@ template<typename PacketType> struct reverse_packet_cond<PacketType,false> static inline PacketType run(const PacketType& x) { return x; } }; -} // end namespace internal +} // end namespace internal /** \class Reverse * \ingroup Core_Module @@ -89,8 +89,10 @@ template<typename MatrixType, int Direction> class Reverse EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Reverse) - EIGEN_DEVICE_FUNC inline Index rows() const { return m_matrix.rows(); } - EIGEN_DEVICE_FUNC inline Index cols() const { return m_matrix.cols(); } + EIGEN_DEVICE_FUNC EIGEN_CONSTEXPR + inline Index rows() const EIGEN_NOEXCEPT { return m_matrix.rows(); } + EIGEN_DEVICE_FUNC EIGEN_CONSTEXPR + inline Index cols() const EIGEN_NOEXCEPT { return m_matrix.cols(); } EIGEN_DEVICE_FUNC inline Index innerStride() const { @@ -98,7 +100,7 @@ template<typename MatrixType, int Direction> class Reverse } EIGEN_DEVICE_FUNC const typename internal::remove_all<typename MatrixType::Nested>::type& - nestedExpression() const + nestedExpression() const { return m_matrix; } @@ -161,7 +163,7 @@ EIGEN_DEVICE_FUNC inline void DenseBase<Derived>::reverseInPlace() } namespace internal { - + template<int Direction> struct vectorwise_reverse_inplace_impl; |