diff options
| author |  Jitse Niesen <jitse@maths.leeds.ac.uk> | 2012-09-29 17:35:15 +0100 |
|---|---|---|
| committer | Jitse Niesen <jitse@maths.leeds.ac.uk> | 2012-09-29 17:35:15 +0100 |
| commit | 2008f761203e239908283d5d54167222b0bdde81 (patch) | |
| tree | 47b02ff768adfc4992d9453917d70c0428745e2d /Eigen/src/Core/util | |
| parent | d7d96f669461c07294f5ef48645fb001cda2d5b0 (diff) | |
| parent | b68102d9a29ac2f631dead3d861f9e84c5897e9c (diff) | |
Merge
Diffstat (limited to 'Eigen/src/Core/util')
| -rw-r--r-- | Eigen/src/Core/util/XprHelper.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/util/XprHelper.h b/Eigen/src/Core/util/XprHelper.h index 4fd6a23d5..3d1290cd2 100644 --- a/Eigen/src/Core/util/XprHelper.h +++ b/Eigen/src/Core/util/XprHelper.h @@ -322,9 +322,9 @@ template<typename T, int n=1, typename PlainObject = typename eval<T>::type> str // it's important that this value can still be squared without integer overflowing. DynamicAsInteger = 10000, ScalarReadCost = NumTraits<typename traits<T>::Scalar>::ReadCost, - ScalarReadCostAsInteger = ScalarReadCost == Dynamic ? DynamicAsInteger : ScalarReadCost, + ScalarReadCostAsInteger = ScalarReadCost == Dynamic ? int(DynamicAsInteger) : int(ScalarReadCost), CoeffReadCost = traits<T>::CoeffReadCost, - CoeffReadCostAsInteger = CoeffReadCost == Dynamic ? DynamicAsInteger : CoeffReadCost, + CoeffReadCostAsInteger = CoeffReadCost == Dynamic ? int(DynamicAsInteger) : int(CoeffReadCost), NAsInteger = n == Dynamic ? int(DynamicAsInteger) : n, CostEvalAsInteger = (NAsInteger+1) * ScalarReadCostAsInteger + CoeffReadCostAsInteger, CostNoEvalAsInteger = NAsInteger * CoeffReadCostAsInteger |