aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/util/Constants.h
diff options
context:
space:
mode:
authorGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2009-01-04 15:26:32 +0000
committerGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2009-01-04 15:26:32 +0000
commit15ca6659acea545178116096bff3e42068b4f4cb (patch)
tree0f4093c77a3312b69dff071db7fd1ad14a3d6d25 /Eigen/src/Core/util/Constants.h
parentd9e5fd393a48db368dd90cf7119ebb3d774111cb (diff)
* the 4th template param of Matrix is now Options. One bit for storage
order, one bit for enabling/disabling auto-alignment. If you want to disable, do: Matrix<float,4,1,Matrix_DontAlign> The Matrix_ prefix is the only way I can see to avoid ambiguity/pollution. The old RowMajor, ColMajor constants are deprecated, remain for now. * this prompted several improvements in matrix_storage. ei_aligned_array renamed to ei_matrix_array and moved there. The %16==0 tests are now much more centralized in 1 place there. * unalignedassert test: updated * update FindEigen2.cmake from KDElibs * determinant test: use VERIFY_IS_APPROX to fix false positives; add testing of 1 big matrix
Diffstat (limited to 'Eigen/src/Core/util/Constants.h')
-rw-r--r--Eigen/src/Core/util/Constants.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/Eigen/src/Core/util/Constants.h b/Eigen/src/Core/util/Constants.h
index 203f3b294..a535e2417 100644
--- a/Eigen/src/Core/util/Constants.h
+++ b/Eigen/src/Core/util/Constants.h
@@ -223,8 +223,15 @@ enum {
};
enum {
- ColMajor = 0,
- RowMajor = RowMajorBit
+ Matrix_ColMajor = 0,
+ Matrix_RowMajor = 0x1, // it is only a coincidence that this is equal to RowMajorBit -- don't rely on that
+ /** \internal Don't require alignment for the matrix itself (the array of coefficients, if dynamically allocated, may still be
+ requested to be aligned) */
+ ColMajor = Matrix_ColMajor, // deprecated
+ RowMajor = Matrix_RowMajor, // deprecated
+ Matrix_DontAlign = 0,
+ /** \internal Align the matrix itself */
+ Matrix_AutoAlign = 0x2
};
enum {