GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-13 20:26:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conservative_resize compilation errors.

Browse Source
This commit is contained in:
Hauke Heibel 2009-09-08 10:02:19 +02:00
parent e6cac85333
commit 3a2499fb11
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@
#ifndef EIGEN_MATRIX_H #ifndef EIGEN_MATRIX_H
#define EIGEN_MATRIX_H #define EIGEN_MATRIX_H
template <typename Derived, typename OtherDerived, bool IsVector = static_cast<bool>(Derived::IsVectorAtCompileTime)> struct ei_conservative_resize_like_impl;
/** \class Matrix /** \class Matrix
* *
@ -701,7 +702,7 @@ class Matrix
friend struct ei_matrix_swap_impl; friend struct ei_matrix_swap_impl;
}; };
template <typename Derived, typename OtherDerived, bool IsVector = static_cast<bool>(Derived::IsVectorAtCompileTime)> template <typename Derived, typename OtherDerived, bool IsVector>
struct ei_conservative_resize_like_impl struct ei_conservative_resize_like_impl
{ {
static void run(MatrixBase<Derived>& _this, const MatrixBase<OtherDerived>& other) static void run(MatrixBase<Derived>& _this, const MatrixBase<OtherDerived>& other)
@ -714,7 +715,7 @@ struct ei_conservative_resize_like_impl
EIGEN_STATIC_ASSERT_DYNAMIC_SIZE(Derived) EIGEN_STATIC_ASSERT_DYNAMIC_SIZE(Derived)
EIGEN_STATIC_ASSERT_DYNAMIC_SIZE(OtherDerived) EIGEN_STATIC_ASSERT_DYNAMIC_SIZE(OtherDerived)
MatrixBase<Derived>::PlainMatrixType tmp(other); typename MatrixBase<Derived>::PlainMatrixType tmp(other);
const int common_rows = std::min(tmp.rows(), _this.rows()); const int common_rows = std::min(tmp.rows(), _this.rows());
const int common_cols = std::min(tmp.cols(), _this.cols()); const int common_cols = std::min(tmp.cols(), _this.cols());
tmp.block(0,0,common_rows,common_cols) = _this.block(0,0,common_rows,common_cols); tmp.block(0,0,common_rows,common_cols) = _this.block(0,0,common_rows,common_cols);
@ -728,7 +729,7 @@ struct ei_conservative_resize_like_impl<Derived,OtherDerived,true>
static void run(MatrixBase<Derived>& _this, const MatrixBase<OtherDerived>& other) static void run(MatrixBase<Derived>& _this, const MatrixBase<OtherDerived>& other)
{ {
// segment(...) will check whether Derived/OtherDerived are vectors! // segment(...) will check whether Derived/OtherDerived are vectors!
MatrixBase<Derived>::PlainMatrixType tmp(other); typename MatrixBase<Derived>::PlainMatrixType tmp(other);
const int common_size = std::min<int>(_this.size(),tmp.size()); const int common_size = std::min<int>(_this.size(),tmp.size());
tmp.segment(0,common_size) = _this.segment(0,common_size); tmp.segment(0,common_size) = _this.segment(0,common_size);
_this.derived().swap(tmp); _this.derived().swap(tmp);