From: ageay <ageay>
Date: Thu, 25 Feb 2010 17:48:11 +0000 (+0000)
Subject: More generic.
X-Git-Tag: V5_1_main_FINAL~187
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a55132dc74af29fca214fb1426ec92e0a625a849;p=tools%2Fmedcoupling.git

More generic.
---

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<const ValueDoubleExpr *>(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<const double&, const double&, const double& >(std::max));
   return ret;
 }
 
@@ -401,6 +401,6 @@ Value *ValueDoubleExpr::min(const Value *other) const throw(INTERP_KERNEL::Excep
 {
   const ValueDoubleExpr *otherC=static_cast<const ValueDoubleExpr *>(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<const double&, const double&, const double& >(std::min));
   return ret;
 }