From: vsr <vsr@opencascade.com>
Date: Fri, 26 Feb 2010 08:49:39 +0000 (+0000)
Subject: Additional cross-platform compatibility Linux/Windows
X-Git-Tag: V5_1_main_FINAL~184
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=862cfd65bdf4f91e75784d100f369c25085d43d7;p=tools%2Fmedcoupling.git

Additional cross-platform compatibility Linux/Windows
---

diff --git a/src/MEDCoupling/MEDCouplingExtrudedMesh.cxx b/src/MEDCoupling/MEDCouplingExtrudedMesh.cxx
index 72e2a25d4..a286dc69b 100644
--- a/src/MEDCoupling/MEDCouplingExtrudedMesh.cxx
+++ b/src/MEDCoupling/MEDCouplingExtrudedMesh.cxx
@@ -91,8 +91,8 @@ void MEDCouplingExtrudedMesh::getBoundingBox(double *bbox) const
   std::fill(bbox1DMax,bbox1DMax+3,-(std::numeric_limits<double>::max()));
   for(int i=0;i<nbOfNodes1D;i++)
     {
-		std::transform(nodes1D+3*i,nodes1D+3*(i+1),bbox1DMin,bbox1DMin,std::ptr_fun(std::min<double>));
-		std::transform(nodes1D+3*i,nodes1D+3*(i+1),bbox1DMax,bbox1DMax,std::ptr_fun(std::max<double>));
+      std::transform(nodes1D+3*i,nodes1D+3*(i+1),bbox1DMin,bbox1DMin,static_cast<const double& (*)(const double&, const double&)>(std::min<double>));
+      std::transform(nodes1D+3*i,nodes1D+3*(i+1),bbox1DMax,bbox1DMax,static_cast<const double& (*)(const double&, const double&)>(std::max<double>));
     }
   std::transform(bbox1DMax,bbox1DMax+3,bbox1DMin,tmp,std::minus<double>());
   int id=std::max_element(tmp,tmp+3)-tmp;
diff --git a/src/MEDCoupling/MEDCouplingUMesh.cxx b/src/MEDCoupling/MEDCouplingUMesh.cxx
index 7d678c09d..86ad3e08e 100644
--- a/src/MEDCoupling/MEDCouplingUMesh.cxx
+++ b/src/MEDCoupling/MEDCouplingUMesh.cxx
@@ -843,7 +843,7 @@ MEDCouplingFieldDouble *MEDCouplingUMesh::getMeasureField(bool isAbs) const
 
 MEDCouplingFieldDouble *MEDCouplingUMesh::getMeasureFieldOnNode(bool isAbs) const
 {
-  MEDCouplingFieldDouble *tmp=getMeasureField(abs);
+  MEDCouplingFieldDouble *tmp=getMeasureField(isAbs);
   std::string name="MeasureOnNodeOfMesh_";
   name+=getName();
   int nbNodes=getNumberOfNodes();
@@ -1020,7 +1020,7 @@ MEDCouplingUMesh *MEDCouplingUMesh::mergeUMeshes(const MEDCouplingUMesh *mesh1,
   DataArrayInt *nodalIndex=DataArrayInt::aggregate(mesh1->getNodalConnectivityIndex(),
                                                    mesh2->getNodalConnectivityIndex(),1);
   std::transform(nodalIndex->getConstPointer()+pos+1,nodalIndex->getConstPointer()+end,
-                 nodalIndex->getPointer()+pos+1,std::bind2nd(std::plus<double>(),delta));
+                 nodalIndex->getPointer()+pos+1,std::bind2nd(std::plus<int>(),delta));
   DataArrayInt *newNodal2=mesh2->getNodalConnectivity()->deepCopy();
   delta=mesh1->getNumberOfNodes();
   const int *nI2=mesh2->getNodalConnectivityIndex()->getConstPointer();