diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2008-05-12 18:09:30 +0000 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2008-05-12 18:09:30 +0000 |
| commit | 4317fad8692eabe09bcafdd88de254deb8e3ea6f (patch) | |
| tree | 63a1980526cda03e564440cf355fcae5e0d6af3b /Eigen/src/Core/util/Meta.h | |
| parent | 678f18fce4dec90ffa97b2fb3a92d572fb64c059 (diff) | |
* 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.
Diffstat (limited to 'Eigen/src/Core/util/Meta.h')
| -rw-r--r-- | Eigen/src/Core/util/Meta.h | 10 |
1 files changed, 5 insertions, 5 deletions
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<typename T, int n=1> struct ei_nested ei_is_temporary<T>::ret, T, typename ei_meta_if< - ei_traits<T>::Flags & EvalBeforeNestingBit - || (n+1) * NumTraits<typename ei_traits<T>::Scalar>::ReadCost < (n-1) * T::CoeffReadCost, + int(ei_traits<T>::Flags) & EvalBeforeNestingBit + || (n+1) * int(NumTraits<typename ei_traits<T>::Scalar>::ReadCost) < (n-1) * int(T::CoeffReadCost), typename ei_eval<T>::type, const T& >::ret |