diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-10-20 15:55:32 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-10-20 15:55:32 +0200 |
| commit | fe57b2f963da832d14f4d7b6d4a9554ceef26e36 (patch) | |
| tree | ed0e5d13ae6dde3f98d012ad3f87570b77e8230d /Eigen/src/SparseCore/SparseFuzzy.h | |
| parent | c12b7896d0ddf95e8f060c93a5cf2fcfa1e6865c (diff) | |
bug #701: workaround (min) and (max) blocking ADL by introducing numext::mini and numext::maxi internal functions and a EIGEN_NOT_A_MACRO macro.
Diffstat (limited to 'Eigen/src/SparseCore/SparseFuzzy.h')
| -rw-r--r-- | Eigen/src/SparseCore/SparseFuzzy.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Eigen/src/SparseCore/SparseFuzzy.h b/Eigen/src/SparseCore/SparseFuzzy.h index a76c1a5e0..7d47eb94d 100644 --- a/Eigen/src/SparseCore/SparseFuzzy.h +++ b/Eigen/src/SparseCore/SparseFuzzy.h @@ -16,13 +16,12 @@ template<typename Derived> template<typename OtherDerived> bool SparseMatrixBase<Derived>::isApprox(const SparseMatrixBase<OtherDerived>& other, const RealScalar &prec) const { - using std::min; const typename internal::nested_eval<Derived,2,PlainObject>::type actualA(derived()); typename internal::conditional<bool(IsRowMajor)==bool(OtherDerived::IsRowMajor), const typename internal::nested_eval<OtherDerived,2,PlainObject>::type, const PlainObject>::type actualB(other.derived()); - return (actualA - actualB).squaredNorm() <= prec * prec * (min)(actualA.squaredNorm(), actualB.squaredNorm()); + return (actualA - actualB).squaredNorm() <= prec * prec * numext::mini(actualA.squaredNorm(), actualB.squaredNorm()); } } // end namespace Eigen |