Changed the AnyMatrixBase / ei_special_scalar_op inheritance order as proposed by Gael.

Added conservativeResizeLike as discussed on the mailing list.
This commit is contained in:
Hauke Heibel
2009-09-07 17:22:01 +02:00
parent 8f4bf4ed7f
commit 64095b6610
4 changed files with 81 additions and 43 deletions

View File

@@ -36,8 +36,6 @@
* Notice that this class is trivial, it is only used to disambiguate overloaded functions.
*/
template<typename Derived> struct AnyMatrixBase
: public ei_special_scalar_op_base<Derived,typename ei_traits<Derived>::Scalar,
typename NumTraits<typename ei_traits<Derived>::Scalar>::Real>
{
typedef typename ei_plain_matrix_type<Derived>::type PlainMatrixType;
@@ -93,7 +91,8 @@ template<typename Derived> struct AnyMatrixBase
*/
template<typename Derived> class MatrixBase
#ifndef EIGEN_PARSED_BY_DOXYGEN
: public AnyMatrixBase<Derived>
: public ei_special_scalar_op_base<Derived,typename ei_traits<Derived>::Scalar,
typename NumTraits<typename ei_traits<Derived>::Scalar>::Real>
#endif // not EIGEN_PARSED_BY_DOXYGEN
{
public: