diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2008-07-26 12:08:28 +0000 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2008-07-26 12:08:28 +0000 |
| commit | f997a3e9020605d66aeb5a546b37bbfa1c69ef22 (patch) | |
| tree | 4f18169cc0c1f14925aaded9b017696baa3a6e19 /Eigen/src/Core/Map.h | |
| parent | b466c266a0081685d27855684f22d7ccc5fb10ea (diff) | |
update the inverse test a little
make use of static asserts in Map
fix 2 warnings in CacheFriendlyProduct: unused var 'Vectorized'
Diffstat (limited to 'Eigen/src/Core/Map.h')
| -rw-r--r-- | Eigen/src/Core/Map.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Eigen/src/Core/Map.h b/Eigen/src/Core/Map.h index 13664eebc..e6f8cdcbd 100644 --- a/Eigen/src/Core/Map.h +++ b/Eigen/src/Core/Map.h @@ -127,8 +127,7 @@ template<typename MatrixType, int Alignment> class Map inline Map(const Scalar* data) : m_data(data), m_rows(RowsAtCompileTime), m_cols(ColsAtCompileTime) { - ei_assert(RowsAtCompileTime != Dynamic && ColsAtCompileTime != Dynamic); - ei_assert(RowsAtCompileTime > 0 && ColsAtCompileTime > 0); + EIGEN_STATIC_ASSERT_FIXED_SIZE(MatrixType) } inline Map(const Scalar* data, int size) @@ -136,11 +135,9 @@ template<typename MatrixType, int Alignment> class Map m_rows(RowsAtCompileTime == Dynamic ? size : RowsAtCompileTime), m_cols(ColsAtCompileTime == Dynamic ? size : ColsAtCompileTime) { + EIGEN_STATIC_ASSERT_VECTOR_ONLY(MatrixType) ei_assert(size > 0); - ei_assert((RowsAtCompileTime == 1 - && (ColsAtCompileTime == Dynamic || ColsAtCompileTime == size)) - || (ColsAtCompileTime == 1 - && (RowsAtCompileTime == Dynamic || RowsAtCompileTime == size))); + ei_assert(SizeAtCompileTime == Dynamic || SizeAtCompileTime == size); } inline Map(const Scalar* data, int rows, int cols) |