From 4317fad8692eabe09bcafdd88de254deb8e3ea6f Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Mon, 12 May 2008 18:09:30 +0000 Subject: * Added several cast to int of the enums (needed for some compilers) * Fix a mistake in CwiseNullary. * Added a CoreDeclarions header that declares only the forward declarations and related basic stuffs. --- Eigen/src/Core/util/Meta.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Eigen/src/Core/util/Meta.h') diff --git a/Eigen/src/Core/util/Meta.h b/Eigen/src/Core/util/Meta.h index 264802b9b..3c4596d4c 100644 --- a/Eigen/src/Core/util/Meta.h +++ b/Eigen/src/Core/util/Meta.h @@ -158,9 +158,9 @@ class ei_corrected_matrix_flags }; public: - enum { ret = is_vectorizable - ? _flags1 | VectorizableBit - : _flags1 & ~VectorizableBit + enum { ret = int(is_vectorizable) + ? int(_flags1) | int(VectorizableBit) + : int(_flags1) & ~int(VectorizableBit) }; }; @@ -208,8 +208,8 @@ template struct ei_nested ei_is_temporary::ret, T, typename ei_meta_if< - ei_traits::Flags & EvalBeforeNestingBit - || (n+1) * NumTraits::Scalar>::ReadCost < (n-1) * T::CoeffReadCost, + int(ei_traits::Flags) & EvalBeforeNestingBit + || (n+1) * int(NumTraits::Scalar>::ReadCost) < (n-1) * int(T::CoeffReadCost), typename ei_eval::type, const T& >::ret -- cgit v1.2.3