diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/commainitializer.cpp | 2 | ||||
-rw-r--r-- | test/product.h | 3 | ||||
-rw-r--r-- | test/product_large.cpp | 6 |
3 files changed, 3 insertions, 8 deletions
diff --git a/test/commainitializer.cpp b/test/commainitializer.cpp index 257ecc21f..a93a57d8f 100644 --- a/test/commainitializer.cpp +++ b/test/commainitializer.cpp @@ -33,7 +33,7 @@ void test_commainitializer() VERIFY_RAISES_ASSERT( (m3 << 1, 2, 3, 4, 5, 6, 7, 8, 9, 10) ); double data[] = {1, 2, 3, 4, 5, 6, 7, 8, 9}; - Matrix3d ref = Map<Matrix<double,3,3,3,3,RowMajorBit> >(data); + Matrix3d ref = Map<Matrix<double,3,3,RowMajor> >(data); m3 = Matrix3d::Random(); m3 << 1, 2, 3, 4, 5, 6, 7, 8, 9; diff --git a/test/product.h b/test/product.h index 374994576..f1a16cf1f 100644 --- a/test/product.h +++ b/test/product.h @@ -46,8 +46,7 @@ template<typename MatrixType> void product(const MatrixType& m) typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime> RowSquareMatrixType; typedef Matrix<Scalar, MatrixType::ColsAtCompileTime, MatrixType::ColsAtCompileTime> ColSquareMatrixType; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::ColsAtCompileTime, - MatrixType::RowsAtCompileTime, MatrixType::ColsAtCompileTime, - MatrixType::Flags&RowMajorBit ? 0 : RowMajorBit> OtherMajorMatrixType; + MatrixType::Flags&RowMajorBit> OtherMajorMatrixType; int rows = m.rows(); int cols = m.cols(); diff --git a/test/product_large.cpp b/test/product_large.cpp index 904cf5a0b..b85fd0954 100644 --- a/test/product_large.cpp +++ b/test/product_large.cpp @@ -31,10 +31,6 @@ void test_product_large() CALL_SUBTEST( product(MatrixXd(ei_random<int>(1,320), ei_random<int>(1,320))) ); CALL_SUBTEST( product(MatrixXi(ei_random<int>(1,320), ei_random<int>(1,320))) ); CALL_SUBTEST( product(MatrixXcf(ei_random<int>(1,50), ei_random<int>(1,50))) ); - #ifndef EIGEN_DEFAULT_TO_ROW_MAJOR - CALL_SUBTEST( product(Matrix<float,Dynamic,Dynamic,Dynamic,Dynamic,RowMajorBit>(ei_random<int>(1,320), ei_random<int>(1,320))) ); - #else - CALL_SUBTEST( product(Matrix<float,Dynamic,Dynamic,Dynamic,Dynamic,0>(ei_random<int>(1,320), ei_random<int>(1,320))) ); - #endif + CALL_SUBTEST( product(Matrix<float,Dynamic,Dynamic,RowMajor>(ei_random<int>(1,320), ei_random<int>(1,320))) ); } } |