diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2007-09-27 07:42:12 +0000 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2007-09-27 07:42:12 +0000 |
| commit | 628b1a8f6d2635bc7dadfd16f3af56b4a664e233 (patch) | |
| tree | 1496ce52ab13d6f220aab6fca6ab55e0416658ab /src/internal/Matrix.h | |
| parent | 8a024825d26aee76431e4c7dab98f114bf51dff2 (diff) | |
implement scalar operators separately for each type using a macro.
This is required e.g. to allow "2 * m" with m a matrix of doubles.
Diffstat (limited to 'src/internal/Matrix.h')
| -rw-r--r-- | src/internal/Matrix.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/internal/Matrix.h b/src/internal/Matrix.h index 15042beed..c07aa2d08 100644 --- a/src/internal/Matrix.h +++ b/src/internal/Matrix.h @@ -84,8 +84,8 @@ class Matrix : public EigenBase<_Scalar, Matrix<_Scalar, _Rows, _Cols> >, return Base::operator=(other); } - INHERIT_ASSIGNMENT_OPERATOR(Matrix, +=) - INHERIT_ASSIGNMENT_OPERATOR(Matrix, -=) + EIGEN_INHERIT_ASSIGNMENT_OPERATOR(Matrix, +=) + EIGEN_INHERIT_ASSIGNMENT_OPERATOR(Matrix, -=) explicit Matrix(int rows = 1, int cols = 1) : Storage(rows, cols) {} template<typename OtherDerived> @@ -124,6 +124,9 @@ EIGEN_MAKE_TYPEDEFS_ALL_SIZES(std::complex<int>, ci) EIGEN_MAKE_TYPEDEFS_ALL_SIZES(std::complex<float>, cf) EIGEN_MAKE_TYPEDEFS_ALL_SIZES(std::complex<double>, cd) +#undef EIGEN_MAKE_TYPEDEFS_ALL_SIZES +#undef EIGEN_MAKE_TYPEDEFS + } // namespace Eigen #include "MatrixOps.h" |