diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2008-08-28 00:33:58 +0000 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2008-08-28 00:33:58 +0000 |
| commit | 70266b4d05d2565326d014f678d6c812edd3e27e (patch) | |
| tree | 5f4deff0c9bb22ec364b877e2bba200b3b3e0463 /Eigen/src/Core | |
| parent | f7de12de690f1b3a7444c503d1a97ca7efc2fa16 (diff) | |
doc + quick bug fix in Matrix ctor
Diffstat (limited to 'Eigen/src/Core')
| -rw-r--r-- | Eigen/src/Core/Matrix.h | 3 | ||||
| -rw-r--r-- | Eigen/src/Core/util/ForwardDeclarations.h | 2 | ||||
| -rw-r--r-- | Eigen/src/Core/util/StaticAssert.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Eigen/src/Core/Matrix.h b/Eigen/src/Core/Matrix.h index fb531c1e8..4fce434e9 100644 --- a/Eigen/src/Core/Matrix.h +++ b/Eigen/src/Core/Matrix.h @@ -335,7 +335,8 @@ class Matrix inline Matrix(const MatrixBase<OtherDerived>& other) : m_storage(other.rows() * other.cols(), other.rows(), other.cols()) { - Base::lazyAssign(other.derived()); + ei_assign_selector<Matrix,OtherDerived,false>::run(*this, other.derived()); + //Base::operator=(other.derived()); } /** Copy constructor */ inline Matrix(const Matrix& other) diff --git a/Eigen/src/Core/util/ForwardDeclarations.h b/Eigen/src/Core/util/ForwardDeclarations.h index 3d9f99644..8e40bea0f 100644 --- a/Eigen/src/Core/util/ForwardDeclarations.h +++ b/Eigen/src/Core/util/ForwardDeclarations.h @@ -81,6 +81,8 @@ template<typename Scalar> struct ei_scalar_min_op; template<typename Scalar> struct ei_scalar_max_op; template<typename Scalar> struct ei_scalar_random_op; template<typename Scalar> struct ei_scalar_add_op; +template<typename Scalar> struct ei_scalar_constant_op; +template<typename Scalar> struct ei_scalar_identity_op; struct IOFormat; diff --git a/Eigen/src/Core/util/StaticAssert.h b/Eigen/src/Core/util/StaticAssert.h index cf5e7239a..ad46bde46 100644 --- a/Eigen/src/Core/util/StaticAssert.h +++ b/Eigen/src/Core/util/StaticAssert.h @@ -121,5 +121,4 @@ || int(TYPE0::ColsAtCompileTime)==int(TYPE1::ColsAtCompileTime))),\ you_mixed_matrices_of_different_sizes) - #endif // EIGEN_STATIC_ASSERT_H |