diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2007-11-27 13:57:51 +0000 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2007-11-27 13:57:51 +0000 |
| commit | 39f1776bde27b159814148a54483b6b2bdf51aa8 (patch) | |
| tree | e369c7ad167a338db04f0e250d6f23065b3a53a6 /src/Core/ScalarMultiple.h | |
| parent | 344623e872c455114f73b84fb02210c12a97e133 (diff) | |
rename Object -> MatrixBase
Diffstat (limited to 'src/Core/ScalarMultiple.h')
| -rw-r--r-- | src/Core/ScalarMultiple.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Core/ScalarMultiple.h b/src/Core/ScalarMultiple.h index f6a5ea6c5..1798f06fe 100644 --- a/src/Core/ScalarMultiple.h +++ b/src/Core/ScalarMultiple.h @@ -27,12 +27,12 @@ #define EIGEN_SCALARMULTIPLE_H template<typename MatrixType> class ScalarMultiple - : public Object<typename MatrixType::Scalar, ScalarMultiple<MatrixType> > + : public MatrixBase<typename MatrixType::Scalar, ScalarMultiple<MatrixType> > { public: typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::Ref MatRef; - friend class Object<typename MatrixType::Scalar, ScalarMultiple<MatrixType> >; + friend class MatrixBase<typename MatrixType::Scalar, ScalarMultiple<MatrixType> >; static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime, ColsAtCompileTime = MatrixType::ColsAtCompileTime; @@ -64,7 +64,7 @@ template<typename MatrixType> class ScalarMultiple #define EIGEN_MAKE_SCALAR_OPS(OtherScalar) \ template<typename Scalar, typename Derived> \ ScalarMultiple<Derived> \ -operator*(const Object<Scalar, Derived>& matrix, \ +operator*(const MatrixBase<Scalar, Derived>& matrix, \ OtherScalar scalar) \ { \ return ScalarMultiple<Derived>(matrix.ref(), scalar); \ @@ -73,14 +73,14 @@ operator*(const Object<Scalar, Derived>& matrix, \ template<typename Scalar, typename Derived> \ ScalarMultiple<Derived> \ operator*(OtherScalar scalar, \ - const Object<Scalar, Derived>& matrix) \ + const MatrixBase<Scalar, Derived>& matrix) \ { \ return ScalarMultiple<Derived>(matrix.ref(), scalar); \ } \ \ template<typename Scalar, typename Derived> \ ScalarMultiple<Derived> \ -operator/(const Object<Scalar, Derived>& matrix, \ +operator/(const MatrixBase<Scalar, Derived>& matrix, \ OtherScalar scalar) \ { \ assert(NumTraits<Scalar>::HasFloatingPoint); \ @@ -89,14 +89,14 @@ operator/(const Object<Scalar, Derived>& matrix, \ \ template<typename Scalar, typename Derived> \ Derived & \ -Object<Scalar, Derived>::operator*=(const OtherScalar &other) \ +MatrixBase<Scalar, Derived>::operator*=(const OtherScalar &other) \ { \ return *this = *this * other; \ } \ \ template<typename Scalar, typename Derived> \ Derived & \ -Object<Scalar, Derived>::operator/=(const OtherScalar &other) \ +MatrixBase<Scalar, Derived>::operator/=(const OtherScalar &other) \ { \ return *this = *this / other; \ } |