diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2010-03-04 18:59:03 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2010-03-04 18:59:03 +0100 |
| commit | 0964810fba3236f0ecc22bd35bd356c2d671c889 (patch) | |
| tree | bbb15111b367fda6ab2d1ef4101f82d30758efb5 | |
| parent | ea8cad51518cfae6eb7406268aef6c28ff62389f (diff) | |
| parent | 17230686944e63cca8d9ce1c981d6e869fcbcb62 (diff) | |
merge
| -rw-r--r-- | Eigen/src/Core/Coeffs.h | 16 | ||||
| -rw-r--r-- | Eigen/src/Core/DenseBase.h | 9 | ||||
| -rw-r--r-- | Eigen/src/Core/MatrixBase.h | 9 |
3 files changed, 17 insertions, 17 deletions
diff --git a/Eigen/src/Core/Coeffs.h b/Eigen/src/Core/Coeffs.h index da7b9153f..727dea75e 100644 --- a/Eigen/src/Core/Coeffs.h +++ b/Eigen/src/Core/Coeffs.h @@ -239,42 +239,42 @@ EIGEN_STRONG_INLINE typename ei_traits<Derived>::Scalar& DenseBase<Derived> /** equivalent to operator[](0). */ template<typename Derived> -EIGEN_STRONG_INLINE const typename MatrixBase<Derived>::CoeffReturnType MatrixBase<Derived> +EIGEN_STRONG_INLINE const typename DenseBase<Derived>::CoeffReturnType DenseBase<Derived> ::x() const { return (*this)[0]; } /** equivalent to operator[](1). */ template<typename Derived> -EIGEN_STRONG_INLINE const typename MatrixBase<Derived>::CoeffReturnType MatrixBase<Derived> +EIGEN_STRONG_INLINE const typename DenseBase<Derived>::CoeffReturnType DenseBase<Derived> ::y() const { return (*this)[1]; } /** equivalent to operator[](2). */ template<typename Derived> -EIGEN_STRONG_INLINE const typename MatrixBase<Derived>::CoeffReturnType MatrixBase<Derived> +EIGEN_STRONG_INLINE const typename DenseBase<Derived>::CoeffReturnType DenseBase<Derived> ::z() const { return (*this)[2]; } /** equivalent to operator[](3). */ template<typename Derived> -EIGEN_STRONG_INLINE const typename MatrixBase<Derived>::CoeffReturnType MatrixBase<Derived> +EIGEN_STRONG_INLINE const typename DenseBase<Derived>::CoeffReturnType DenseBase<Derived> ::w() const { return (*this)[3]; } /** equivalent to operator[](0). */ template<typename Derived> -EIGEN_STRONG_INLINE typename ei_traits<Derived>::Scalar& MatrixBase<Derived> +EIGEN_STRONG_INLINE typename ei_traits<Derived>::Scalar& DenseBase<Derived> ::x() { return (*this)[0]; } /** equivalent to operator[](1). */ template<typename Derived> -EIGEN_STRONG_INLINE typename ei_traits<Derived>::Scalar& MatrixBase<Derived> +EIGEN_STRONG_INLINE typename ei_traits<Derived>::Scalar& DenseBase<Derived> ::y() { return (*this)[1]; } /** equivalent to operator[](2). */ template<typename Derived> -EIGEN_STRONG_INLINE typename ei_traits<Derived>::Scalar& MatrixBase<Derived> +EIGEN_STRONG_INLINE typename ei_traits<Derived>::Scalar& DenseBase<Derived> ::z() { return (*this)[2]; } /** equivalent to operator[](3). */ template<typename Derived> -EIGEN_STRONG_INLINE typename ei_traits<Derived>::Scalar& MatrixBase<Derived> +EIGEN_STRONG_INLINE typename ei_traits<Derived>::Scalar& DenseBase<Derived> ::w() { return (*this)[3]; } /** \returns the packet of coefficients starting at the given row and column. It is your responsibility diff --git a/Eigen/src/Core/DenseBase.h b/Eigen/src/Core/DenseBase.h index 67540bd8c..52a883811 100644 --- a/Eigen/src/Core/DenseBase.h +++ b/Eigen/src/Core/DenseBase.h @@ -280,6 +280,15 @@ template<typename Derived> class DenseBase typedef Block<Derived, 1, ei_traits<Derived>::ColsAtCompileTime> RowXpr; #endif // not EIGEN_PARSED_BY_DOXYGEN + const CoeffReturnType x() const; + const CoeffReturnType y() const; + const CoeffReturnType z() const; + const CoeffReturnType w() const; + Scalar& x(); + Scalar& y(); + Scalar& z(); + Scalar& w(); + /** Copies \a other into *this. \returns a reference to *this. */ template<typename OtherDerived> Derived& operator=(const DenseBase<OtherDerived>& other); diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 9c62163ba..ac79de66d 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -169,15 +169,6 @@ template<typename Derived> class MatrixBase Derived& lazyAssign(const ProductBase<ProductDerived, Lhs,Rhs>& other); #endif // not EIGEN_PARSED_BY_DOXYGEN - const CoeffReturnType x() const; - const CoeffReturnType y() const; - const CoeffReturnType z() const; - const CoeffReturnType w() const; - Scalar& x(); - Scalar& y(); - Scalar& z(); - Scalar& w(); - template<typename OtherDerived> Derived& operator+=(const MatrixBase<OtherDerived>& other); template<typename OtherDerived> |