aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2008-06-13 08:09:48 +0000
committerGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2008-06-13 08:09:48 +0000
commit53289a8b643e69fc86fcfbc5195e1324b306c57d (patch)
tree5b71fb87a6d690e052a8e6d6b3c099c8b36647a0
parentc90c77051f0dc26a18e4e4fe2d7b828fe559db67 (diff)
* even though the _Flags default to the corrected value, still correct
them in the ei_traits, so that they're guaranteed even if the user specified his own non-default flags (like before). Measured to not make compilation any slower.
-rw-r--r--Eigen/src/Core/Matrix.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/Eigen/src/Core/Matrix.h b/Eigen/src/Core/Matrix.h
index 75e2c67b0..baaae57e4 100644
--- a/Eigen/src/Core/Matrix.h
+++ b/Eigen/src/Core/Matrix.h
@@ -87,7 +87,11 @@ struct ei_traits<Matrix<_Scalar, _Rows, _Cols, _MaxRows, _MaxCols, _Flags> >
ColsAtCompileTime = _Cols,
MaxRowsAtCompileTime = _MaxRows,
MaxColsAtCompileTime = _MaxCols,
- Flags = _Flags,
+ Flags = ei_corrected_matrix_flags<
+ _Scalar,
+ ei_size_at_compile_time<_MaxRows,_MaxCols>::ret,
+ _Flags
+ >::ret,
CoeffReadCost = NumTraits<Scalar>::ReadCost
};
};