From: ana <ana@opencascade.com>
Date: Thu, 25 Feb 2010 09:22:01 +0000 (+0000)
Subject: Windows compatibility
X-Git-Tag: V5_1_main_FINAL~189
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=95655c40af385d3e34244a1c5ffd2bbe91ab6caa;p=tools%2Fmedcoupling.git

Windows compatibility
---

diff --git a/src/INTERP_KERNEL/InterpKernelMatrix.hxx b/src/INTERP_KERNEL/InterpKernelMatrix.hxx
index f8092bdd9..da7fd73b3 100755
--- a/src/INTERP_KERNEL/InterpKernelMatrix.hxx
+++ b/src/INTERP_KERNEL/InterpKernelMatrix.hxx
@@ -117,7 +117,7 @@ namespace INTERP_KERNEL
         {
           int size=_ncols_offset[_nb_rows];
           _coeffs = new double[size];
-          _cols = new uint[size];
+          _cols = new unsigned int[size];
           memcpy(_coeffs, m._coeffs, size*sizeof(double));
           memcpy(_cols, m._cols, size*sizeof(int));
         }
@@ -139,7 +139,7 @@ namespace INTERP_KERNEL
         {
           int size=_ncols_offset[_nb_rows];
           _coeffs = new double[size];
-          _cols = new uint[size];
+          _cols = new unsigned int[size];
           memcpy(_coeffs, m._coeffs, size*sizeof(double));
           memcpy(_cols, m._cols, size*sizeof(int));
         }
@@ -161,7 +161,7 @@ namespace INTERP_KERNEL
       if (_auxiliary_matrix.empty())
         _auxiliary_matrix.resize(_nb_rows);
       
-      for (uint i=0; i< _auxiliary_matrix[OTT<int,type>::ind2C(irow)].size(); i++)
+      for (unsigned int i=0; i< _auxiliary_matrix[OTT<int,type>::ind2C(irow)].size(); i++)
         if (_auxiliary_matrix[OTT<int,type>::ind2C(irow)][i].first == icol)
           {
             _auxiliary_matrix[OTT<int,type>::ind2C(irow)][i].second = value;
@@ -379,24 +379,24 @@ namespace INTERP_KERNEL
   {
     if (m._is_configured)
       {
-        out << OTT<uint,type>::indFC(0) <<std::endl;
+        out << OTT<unsigned int,type>::indFC(0) <<std::endl;
         out << m._nb_rows<<std::endl;
-        for (uint i=0; i<m._nb_rows; i++)
+        for (unsigned int i=0; i<m._nb_rows; i++)
           {
             out << m._ncols_offset[i+1]-m._ncols_offset[i];
-            for (uint j=m._ncols_offset[i]; j<m._ncols_offset[i+1]; j++)
-              out <<"\t"<< OTT<uint,type>::indFC(m._cols[j]) <<"\t"<<m._coeffs[j];
+            for (unsigned int j=m._ncols_offset[i]; j<m._ncols_offset[i+1]; j++)
+              out <<"\t"<< OTT<unsigned int,type>::indFC(m._cols[j]) <<"\t"<<m._coeffs[j];
             out<<std::endl;
           }
       }
     else
       {
-        out << OTT<uint,type>::indFC(0) <<"\n";
+        out << OTT<unsigned int,type>::indFC(0) <<"\n";
         out << m._nb_rows <<"\n";
-        for (uint i=0; i<m._nb_rows; i++)
+        for (unsigned int i=0; i<m._nb_rows; i++)
           {
             out<< m._auxiliary_matrix[i].size();
-            for (uint j=0; j<m._auxiliary_matrix[i].size(); j++)
+            for (unsigned int j=0; j<m._auxiliary_matrix[i].size(); j++)
               out << "\t" <<m._auxiliary_matrix[i][j].first <<"\t"
                   <<m._auxiliary_matrix[i][j].second;
             out <<"\n";
@@ -410,21 +410,21 @@ namespace INTERP_KERNEL
   {
     int index_base_test;
     in >> index_base_test;
-    if (index_base_test!=OTT<uint,type>::indFC(0))
+    if (index_base_test!=OTT<unsigned int,type>::indFC(0))
       {
         std::cerr << "file index is "<<index_base_test<<std::endl;
         throw Exception("incompatible indexing reading matrix");
       }
     in >> m._nb_rows;
     m._auxiliary_matrix.resize(m._nb_rows);
-    for (uint i=0; i<m._nb_rows; i++)
+    for (unsigned int i=0; i<m._nb_rows; i++)
       {
-        uint ncols;
+        unsigned int ncols;
         in >> ncols;
         m._auxiliary_matrix[i].resize(ncols);
         double value;
-        uint col;
-        for (uint j=0; j<ncols; j++)
+        unsigned int col;
+        for (unsigned int j=0; j<ncols; j++)
           {
             in>>col;
             in>>value;
diff --git a/src/MEDCoupling/MEDCoupling.hxx b/src/MEDCoupling/MEDCoupling.hxx
index 5779d27f7..0159344a2 100644
--- a/src/MEDCoupling/MEDCoupling.hxx
+++ b/src/MEDCoupling/MEDCoupling.hxx
@@ -32,4 +32,14 @@
 #  define MEDCOUPLING_EXPORT
 #endif
 
+#ifdef WNT
+#  if defined medcouplingremapper_EXPORTS
+#    define MEDCOUPLINGREMAPPER_EXPORT __declspec( dllexport )
+#  else
+#    define MEDCOUPLINGREMAPPER_EXPORT __declspec( dllimport )
+#  endif
+#else
+#  define MEDCOUPLINGREMAPPER_EXPORT
+#endif
+
 #endif
diff --git a/src/MEDCoupling/MEDCouplingCMesh.cxx b/src/MEDCoupling/MEDCouplingCMesh.cxx
index 523fb31c8..d1b6aec3c 100644
--- a/src/MEDCoupling/MEDCouplingCMesh.cxx
+++ b/src/MEDCoupling/MEDCouplingCMesh.cxx
@@ -20,6 +20,8 @@
 #include "MEDCouplingMemArray.hxx"
 #include "MEDCouplingFieldDouble.hxx"
 
+#include <functional>
+
 using namespace ParaMEDMEM;
 
 MEDCouplingCMesh::MEDCouplingCMesh():_x_array(0),_y_array(0),_z_array(0)
diff --git a/src/MEDCoupling/MEDCouplingExtrudedMesh.cxx b/src/MEDCoupling/MEDCouplingExtrudedMesh.cxx
index f89a0e5d9..72e2a25d4 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(fmin));
-      std::transform(nodes1D+3*i,nodes1D+3*(i+1),bbox1DMax,bbox1DMax,std::ptr_fun(fmax));
+		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(bbox1DMax,bbox1DMax+3,bbox1DMin,tmp,std::minus<double>());
   int id=std::max_element(tmp,tmp+3)-tmp;
diff --git a/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx b/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx
index a9f648117..f3756291c 100644
--- a/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx
+++ b/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx
@@ -22,6 +22,7 @@
 
 #include <limits>
 #include <algorithm>
+#include  <functional>
 
 using namespace ParaMEDMEM;
 
diff --git a/src/MEDCoupling/MEDCouplingMemArray.cxx b/src/MEDCoupling/MEDCouplingMemArray.cxx
index b4484216c..f3e356477 100644
--- a/src/MEDCoupling/MEDCouplingMemArray.cxx
+++ b/src/MEDCoupling/MEDCouplingMemArray.cxx
@@ -18,6 +18,8 @@
 //
 #include "MEDCouplingMemArray.txx"
 
+#include <functional>
+
 using namespace ParaMEDMEM;
 
 void DataArray::setName(const char *name)
diff --git a/src/MEDCoupling/MEDCouplingRemapper.hxx b/src/MEDCoupling/MEDCouplingRemapper.hxx
index 8ad284a1c..0d65a0f53 100644
--- a/src/MEDCoupling/MEDCouplingRemapper.hxx
+++ b/src/MEDCoupling/MEDCouplingRemapper.hxx
@@ -36,7 +36,7 @@ namespace ParaMEDMEM
 
 namespace ParaMEDMEM
 {
-  class MEDCOUPLING_EXPORT MEDCouplingRemapper : public TimeLabel, public INTERP_KERNEL::InterpolationOptions
+  class MEDCOUPLINGREMAPPER_EXPORT MEDCouplingRemapper : public TimeLabel, public INTERP_KERNEL::InterpolationOptions
   {
   public:
     MEDCouplingRemapper();