From a55132dc74af29fca214fb1426ec92e0a625a849 Mon Sep 17 00:00:00 2001 From: ageay Date: Thu, 25 Feb 2010 17:48:11 +0000 Subject: [PATCH] More generic. --- src/INTERP_KERNEL/ExprEval/InterpKernelUnit.cxx | 2 +- src/INTERP_KERNEL/ExprEval/InterpKernelValue.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.cxx b/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.cxx index 86d5dec51..a123e6c95 100644 --- a/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.cxx +++ b/src/INTERP_KERNEL/ExprEval/InterpKernelUnit.cxx @@ -272,7 +272,7 @@ bool DecompositionInUnitBase::areDoubleEquals(double a, double b) { if(a==0. || b==0.) return a==b; - double ref=fmax(a,b); + double ref=std::max(a,b); return fabs((a-b)/ref)<1e-7; } diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelValue.cxx b/src/INTERP_KERNEL/ExprEval/InterpKernelValue.cxx index 4099113d0..7f0c78bb8 100644 --- a/src/INTERP_KERNEL/ExprEval/InterpKernelValue.cxx +++ b/src/INTERP_KERNEL/ExprEval/InterpKernelValue.cxx @@ -393,7 +393,7 @@ Value *ValueDoubleExpr::max(const Value *other) const throw(INTERP_KERNEL::Excep { const ValueDoubleExpr *otherC=static_cast(other); ValueDoubleExpr *ret=new ValueDoubleExpr(_sz_dest_data,_src_data); - std::transform(_dest_data,_dest_data+_sz_dest_data,otherC->getData(),ret->getData(),std::ptr_fun(fmax)); + std::transform(_dest_data,_dest_data+_sz_dest_data,otherC->getData(),ret->getData(),std::ptr_fun(std::max)); return ret; } @@ -401,6 +401,6 @@ Value *ValueDoubleExpr::min(const Value *other) const throw(INTERP_KERNEL::Excep { const ValueDoubleExpr *otherC=static_cast(other); ValueDoubleExpr *ret=new ValueDoubleExpr(_sz_dest_data,_src_data); - std::transform(_dest_data,_dest_data+_sz_dest_data,otherC->getData(),ret->getData(),std::ptr_fun(fmin)); + std::transform(_dest_data,_dest_data+_sz_dest_data,otherC->getData(),ret->getData(),std::ptr_fun(std::min)); return ret; } -- 2.39.2