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/DenseBase.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/DenseBase.h')
-rw-r--r-- | Eigen/src/Core/DenseBase.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Eigen/src/Core/DenseBase.h b/Eigen/src/Core/DenseBase.h index 7193e60aa..9b16db68d 100644 --- a/Eigen/src/Core/DenseBase.h +++ b/Eigen/src/Core/DenseBase.h @@ -14,7 +14,7 @@ namespace Eigen { namespace internal { - + // The index type defined by EIGEN_DEFAULT_DENSE_INDEX_TYPE must be a signed type. // This dummy function simply aims at checking that at compile time. static inline void check_DenseIndex_is_signed() { @@ -22,7 +22,7 @@ static inline void check_DenseIndex_is_signed() { } } // end namespace internal - + /** \class DenseBase * \ingroup Core_Module * @@ -64,12 +64,12 @@ template<typename Derived> class DenseBase /** The numeric type of the expression' coefficients, e.g. float, double, int or std::complex<float>, etc. */ typedef typename internal::traits<Derived>::Scalar Scalar; - + /** The numeric type of the expression' coefficients, e.g. float, double, int or std::complex<float>, etc. * * It is an alias for the Scalar type */ typedef Scalar value_type; - + typedef typename NumTraits<Scalar>::Real RealScalar; typedef DenseCoeffsBase<Derived, internal::accessors_level<Derived>::value> Base; @@ -158,7 +158,7 @@ template<typename Derived> class DenseBase * a row-vector (if there is only one row). */ NumDimensions = int(MaxSizeAtCompileTime) == 1 ? 0 : bool(IsVectorAtCompileTime) ? 1 : 2, - /**< This value is equal to Tensor::NumDimensions, i.e. 0 for scalars, 1 for vectors, + /**< This value is equal to Tensor::NumDimensions, i.e. 0 for scalars, 1 for vectors, * and 2 for matrices. */ @@ -175,11 +175,11 @@ template<typename Derived> class DenseBase InnerStrideAtCompileTime = internal::inner_stride_at_compile_time<Derived>::ret, OuterStrideAtCompileTime = internal::outer_stride_at_compile_time<Derived>::ret }; - + typedef typename internal::find_best_packet<Scalar,SizeAtCompileTime>::type PacketScalar; enum { IsPlainObjectBase = 0 }; - + /** The plain matrix type corresponding to this expression. * \sa PlainObject */ typedef Matrix<typename internal::traits<Derived>::Scalar, @@ -189,7 +189,7 @@ template<typename Derived> class DenseBase internal::traits<Derived>::MaxRowsAtCompileTime, internal::traits<Derived>::MaxColsAtCompileTime > PlainMatrix; - + /** The plain array type corresponding to this expression. * \sa PlainObject */ typedef Array<typename internal::traits<Derived>::Scalar, @@ -211,7 +211,7 @@ template<typename Derived> class DenseBase /** \returns the number of nonzero coefficients which is in practice the number * of stored coefficients. */ - EIGEN_DEVICE_FUNC + EIGEN_DEVICE_FUNC EIGEN_CONSTEXPR inline Index nonZeros() const { return size(); } /** \returns the outer size. @@ -219,7 +219,7 @@ template<typename Derived> class DenseBase * \note For a vector, this returns just 1. For a matrix (non-vector), this is the major dimension * with respect to the \ref TopicStorageOrders "storage order", i.e., the number of columns for a * column-major matrix, and the number of rows for a row-major matrix. */ - EIGEN_DEVICE_FUNC + EIGEN_DEVICE_FUNC EIGEN_CONSTEXPR Index outerSize() const { return IsVectorAtCompileTime ? 1 @@ -229,9 +229,9 @@ template<typename Derived> class DenseBase /** \returns the inner size. * * \note For a vector, this is just the size. For a matrix (non-vector), this is the minor dimension - * with respect to the \ref TopicStorageOrders "storage order", i.e., the number of rows for a + * with respect to the \ref TopicStorageOrders "storage order", i.e., the number of rows for a * column-major matrix, and the number of columns for a row-major matrix. */ - EIGEN_DEVICE_FUNC + EIGEN_DEVICE_FUNC EIGEN_CONSTEXPR Index innerSize() const { return IsVectorAtCompileTime ? this->size() @@ -411,7 +411,7 @@ template<typename Derived> class DenseBase // size types on MSVC. return typename internal::eval<Derived>::type(derived()); } - + /** swaps *this with the expression \a other. * */ |