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/CwiseNullaryOp.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/CwiseNullaryOp.h')
| -rw-r--r-- | Eigen/src/Core/CwiseNullaryOp.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Eigen/src/Core/CwiseNullaryOp.h b/Eigen/src/Core/CwiseNullaryOp.h index 8f3496fa0..289ec510a 100644 --- a/Eigen/src/Core/CwiseNullaryOp.h +++ b/Eigen/src/Core/CwiseNullaryOp.h @@ -74,10 +74,10 @@ class CwiseNullaryOp : public internal::dense_xpr_base< CwiseNullaryOp<NullaryOp && (ColsAtCompileTime == Dynamic || ColsAtCompileTime == cols)); } - EIGEN_DEVICE_FUNC - EIGEN_STRONG_INLINE Index rows() const { return m_rows.value(); } - EIGEN_DEVICE_FUNC - EIGEN_STRONG_INLINE Index cols() const { return m_cols.value(); } + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE EIGEN_CONSTEXPR + Index rows() const { return m_rows.value(); } + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE EIGEN_CONSTEXPR + Index cols() const { return m_cols.value(); } /** \returns the functor representing the nullary operation */ EIGEN_DEVICE_FUNC @@ -131,7 +131,7 @@ DenseBase<Derived>::NullaryExpr(Index rows, Index cols, const CustomNullaryOp& f * * Here is an example with C++11 random generators: \include random_cpp11.cpp * Output: \verbinclude random_cpp11.out - * + * * \sa class CwiseNullaryOp */ template<typename Derived> |