aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/nomalloc.cpp
diff options
context:
space:
mode:
authorGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2010-03-08 21:30:06 -0500
committerGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2010-03-08 21:30:06 -0500
commitb81351cb07f86bba6956b8a123266050b4df114b (patch)
treecb3b7876e193e4feaa23e9788577befcc8346e7a /test/nomalloc.cpp
parent5a36f4a8d1c84e0837ec53bbf9c1881b938ef157 (diff)
nomalloc: minor cleanup
Diffstat (limited to 'test/nomalloc.cpp')
-rw-r--r--test/nomalloc.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/nomalloc.cpp b/test/nomalloc.cpp
index 9862166eb..a80145f1b 100644
--- a/test/nomalloc.cpp
+++ b/test/nomalloc.cpp
@@ -85,17 +85,17 @@ void ctms_decompositions()
typedef Eigen::Matrix<float,
Eigen::Dynamic, Eigen::Dynamic,
- Eigen::ColMajor | Eigen::AutoAlign,
+ 0,
maxSize, maxSize> Matrix;
typedef Eigen::Matrix<float,
Eigen::Dynamic, 1,
- Eigen::ColMajor | Eigen::AutoAlign,
+ 0,
maxSize, 1> Vector;
typedef Eigen::Matrix<std::complex<float>,
Eigen::Dynamic, Eigen::Dynamic,
- Eigen::ColMajor | Eigen::AutoAlign,
+ 0,
maxSize, maxSize> ComplexMatrix;
const Matrix A(Matrix::Random(size, size));
@@ -134,11 +134,11 @@ void test_nomalloc()
{
// check that our operator new is indeed called:
VERIFY_RAISES_ASSERT(MatrixXd dummy = MatrixXd::Random(3,3));
- CALL_SUBTEST(nomalloc(Matrix<float, 1, 1>()) );
- CALL_SUBTEST(nomalloc(Matrix4d()) );
- CALL_SUBTEST(nomalloc(Matrix<float,32,32>()) );
+ CALL_SUBTEST_1(nomalloc(Matrix<float, 1, 1>()) );
+ CALL_SUBTEST_2(nomalloc(Matrix4d()) );
+ CALL_SUBTEST_3(nomalloc(Matrix<float,32,32>()) );
// Check decomposition modules with dynamic matrices that have a known compile-time max size (ctms)
- CALL_SUBTEST(ctms_decompositions());
+ CALL_SUBTEST_4(ctms_decompositions());
}