diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-06-11 07:56:50 -0400 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-06-11 07:56:50 -0400 |
| commit | bdd7c6c88a0b8cb931480e04e33a17aa08022e06 (patch) | |
| tree | ecc28fd133ddabfccd76a925043e35003ada6e10 /test/block.cpp | |
| parent | 52e8c42a005cb607ba87e4f028e143d6d91f5021 (diff) | |
change the value of Dynamic to -1, since the index type is now configurable.
remove EIGEN_ENUM_MIN/MAX, implement new macros instead
Diffstat (limited to 'test/block.cpp')
| -rw-r--r-- | test/block.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/block.cpp b/test/block.cpp index 2c2825349..a6bf47058 100644 --- a/test/block.cpp +++ b/test/block.cpp @@ -22,6 +22,7 @@ // License and a copy of the GNU General Public License along with // Eigen. If not, see <http://www.gnu.org/licenses/>. +#define EIGEN_NO_STATIC_ASSERT // otherwise we fail at compile time on unused paths #include "main.h" template<typename MatrixType> void block(const MatrixType& m) @@ -71,8 +72,10 @@ template<typename MatrixType> void block(const MatrixType& m) m1.block(r1,c1,r2-r1+1,c2-c1+1) = s1 * m2.block(0, 0, r2-r1+1,c2-c1+1); m1.block(r1,c1,r2-r1+1,c2-c1+1)(r2-r1,c2-c1) = m2.block(0, 0, r2-r1+1,c2-c1+1)(0,0); - const int BlockRows = EIGEN_ENUM_MIN(MatrixType::RowsAtCompileTime,2); - const int BlockCols = EIGEN_ENUM_MIN(MatrixType::ColsAtCompileTime,5); + enum { + BlockRows = 2, + BlockCols = 5 + }; if (rows>=5 && cols>=8) { // test fixed block() as lvalue |