diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-03-12 16:24:25 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-03-12 16:24:25 +0100 |
| commit | 74b1d79d779fbd9fb5bc5df60ad318c012451da7 (patch) | |
| tree | 71023286c86b9542dec0189cab0a7a2ca6935a91 /Eigen/src/Core/MatrixBase.h | |
| parent | 0b362e0c9ab1670e73fc8ae951d765f686342882 (diff) | |
| parent | 2379ccffcb8f1af10f8ed91353d5cb8b3a9a7847 (diff) | |
merge default and evaluator branches
Diffstat (limited to 'Eigen/src/Core/MatrixBase.h')
| -rw-r--r-- | Eigen/src/Core/MatrixBase.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 1f9f295c9..b95b3e6d8 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -378,8 +378,6 @@ template<typename Derived> class MatrixBase Scalar trace() const; -/////////// Array module /////////// - template<int p> EIGEN_DEVICE_FUNC RealScalar lpNorm() const; EIGEN_DEVICE_FUNC MatrixBase<Derived>& matrix() { return *this; } @@ -387,8 +385,10 @@ template<typename Derived> class MatrixBase /** \returns an \link Eigen::ArrayBase Array \endlink expression of this matrix * \sa ArrayBase::matrix() */ - EIGEN_DEVICE_FUNC ArrayWrapper<Derived> array() { return derived(); } - EIGEN_DEVICE_FUNC const ArrayWrapper<const Derived> array() const { return derived(); } + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE ArrayWrapper<Derived> array() { return derived(); } + /** \returns a const \link Eigen::ArrayBase Array \endlink expression of this matrix + * \sa ArrayBase::matrix() */ + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const ArrayWrapper<const Derived> array() const { return derived(); } /////////// LU module /////////// |