aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/util/XprHelper.h
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2015-07-29 10:22:25 +0200
committerGravatar Gael Guennebaud <g.gael@free.fr>2015-07-29 10:22:25 +0200
commit175ed636ea3ac5b1b807642421a036f8a9a10f1f (patch)
treefd6d7126ebef659a12a78e8f18c2d40b2cd3e2bd /Eigen/src/Core/util/XprHelper.h
parent76874b128ec7b191cc986e15ef28c34771120e82 (diff)
bug #973: update macro-level control of alignement by introducing user-controllable EIGEN_MAX_ALIGN_BYTES and EIGEN_MAX_STATIC_ALIGN_BYTES macros. This changeset also removes EIGEN_ALIGN (replaced by EIGEN_MAX_ALIGN_BYTES>0), EIGEN_ALIGN_STATICALLY (replaced by EIGEN_MAX_STATIC_ALIGN_BYTES>0), EIGEN_USER_ALIGN*, EIGEN_ALIGN_DEFAULT (replaced by EIGEN_ALIGN_MAX).
Diffstat (limited to 'Eigen/src/Core/util/XprHelper.h')
-rw-r--r--Eigen/src/Core/util/XprHelper.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/util/XprHelper.h b/Eigen/src/Core/util/XprHelper.h
index 8c280432b..433e816af 100644
--- a/Eigen/src/Core/util/XprHelper.h
+++ b/Eigen/src/Core/util/XprHelper.h
@@ -167,7 +167,7 @@ class compute_matrix_evaluator_flags
(
((Options&DontAlign)==0)
&& (
-#if EIGEN_ALIGN_STATICALLY
+#if EIGEN_MAX_STATIC_ALIGN_BYTES!=0
((!is_dynamic_size_storage) && (((MaxCols*MaxRows*int(sizeof(Scalar))) % align_bytes) == 0))
#else
0
@@ -175,7 +175,7 @@ class compute_matrix_evaluator_flags
||
-#if EIGEN_ALIGN
+#if EIGEN_MAX_ALIGN_BYTES!=0
is_dynamic_size_storage
#else
0