devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conservativeResize.

Browse Source 
Fixed multiple overloads for operator=.
Removed debug output.
This commit is contained in:
Hauke Heibel
2010-01-11 13:57:50 +01:00
parent 376341de4a
commit 325da2ea3c
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Eigen/src/Core/Matrix.h
View File

@@ -152,6 +152,14 @@ class Matrix
using Base::coeff;
using Base::coeffRef;
/** This is a special case of the templated operator=. Its purpose is to
* prevent a default operator= from hiding the templated operator=.
*/
EIGEN_STRONG_INLINE Matrix& operator=(const Matrix& other)
{
return Base::_set(other);
}
/** Copies the value of the expression \a other into \c *this with automatic resizing.
*
* *this might be resized to match the dimensions of \a other. If *this was a null matrix (not already initialized),
@@ -167,15 +175,18 @@ class Matrix
return Base::_set(other);
}
/** This is a special case of the templated operator=. Its purpose is to
* prevent a default operator= from hiding the templated operator=.
/**
* The usage of
* using Base::operator=;
* fails on MSVC. Since the code below is working with GCC and MSVC, we skipped
* the usage of 'using'. This should be done only for operator=.
*/
EIGEN_STRONG_INLINE Matrix& operator=(const Matrix& other)
template<typename OtherDerived>
EIGEN_STRONG_INLINE Matrix& operator=(const AnyMatrixBase<OtherDerived> &other)
{
return Base::_set(other);
return Base::operator=(other);
}
using Base::operator =;
using Base::operator +=;
using Base::operator -=;
using Base::operator *=;
@@ -292,6 +303,8 @@ class Matrix
{
Base::_check_template_params();
Base::resize(other.rows(), other.cols());
// FIXME/CHECK: isn't *this = other.derived() more efficient. it allows to
// go for pure _set() implementations, right?
*this = other;
}