Using size_t instead of int (where possible) in INTERP_KERNEL.

diff --git a/src/INTERP_KERNEL/DirectedBoundingBox.cxx b/src/INTERP_KERNEL/DirectedBoundingBox.cxx
index 8c06642f905ca1ad7c0516069d8930ea9b7b6156..3fdf8ce060f5aa47efc0a059294ef9657027036a 100644 (file)
--- a/src/INTERP_KERNEL/DirectedBoundingBox.cxx
+++ b/src/INTERP_KERNEL/DirectedBoundingBox.cxx
@@ -617,7 +617,7 @@ namespace INTERP_KERNEL
         getCorners( corners, &cornerBox->_minmax[0] );
 
         double globCorner[3];
-        for ( int iC = 0, nC = corners.size()/_dim; iC < nC; ++iC)
+        for ( std::size_t iC = 0, nC = corners.size()/_dim; iC < nC; ++iC)
           {
             cornerBox->fromLocalCS( &corners[iC*_dim], globCorner );
             mmBox.addPointToBox( globCorner );
@@ -649,7 +649,7 @@ namespace INTERP_KERNEL
       getCorners( cornersOther, box );
       DirectedBoundingBox mmBox((double*)0,0,_dim); //!< empty box with CS == this->_axes
       mmBox._axes = this->_axes;
-      for ( int iC = 0, nC = cornersOther.size()/_dim; iC < nC; ++iC)
+      for ( std::size_t iC = 0, nC = cornersOther.size()/_dim; iC < nC; ++iC)
         mmBox.addPointToBox( &cornersOther[iC*_dim] );
 
       if ( isMinMaxOut( &mmBox._minmax[0], &this->_minmax[0], _dim ))
@@ -662,7 +662,7 @@ namespace INTERP_KERNEL
       getCorners( cornersThis, &_minmax[0] );
       DirectedBoundingBox mmBox((double*)0,0,_dim); //!< initailized _minmax
       double globCorner[3];
-      for ( int iC = 0, nC = cornersThis.size()/_dim; iC < nC; ++iC)
+      for ( std::size_t iC = 0, nC = cornersThis.size()/_dim; iC < nC; ++iC)
         {
           fromLocalCS( &cornersThis[iC*_dim], globCorner );
           for ( int i = 0; i < (int)_dim; ++i )

diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.cxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.cxx
index 2c555198835e06eb06afb96e8cca0df7f0432066..bd12d34fd3c9f367c6e48e062af990a1be3f38fc 100644 (file)
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.cxx
+++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DAbstractEdge.cxx
@@ -107,11 +107,11 @@ void IteratorOnComposedEdge::insertElemEdges(ComposedEdge *elems, bool changeMyS
   *_deep_it=*iter;
   _deep_it++;
   iter++;
-  int sizeOfMyList=myListToInsert->size();
+  std::size_t sizeOfMyList=myListToInsert->size();
   _list_handle->insert(_deep_it,iter,myListToInsert->end());
   if(!changeMySelf)
     {
-      for(int i=0;i<sizeOfMyList;i++)
+      for(std::size_t i=0;i<sizeOfMyList;i++)
         _deep_it--;
     }
 }

diff --git a/src/INTERP_KERNEL/Interpolation1D0D.cxx b/src/INTERP_KERNEL/Interpolation1D0D.cxx
index b1a1dd03c955b58007ec75ac539b4b0892fdf1b6..65ab1c0aaac09c4c410b7fb3e6e9ac2182eb7cc0 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation1D0D.cxx
+++ b/src/INTERP_KERNEL/Interpolation1D0D.cxx
@@ -44,8 +44,8 @@ namespace INTERP_KERNEL
     const int SPACE_DIM = 3;
     const double adj(getPrecision());// here precision is used instead of getBoundingBoxAdjustment and getBoundingBoxAdjustmentAbs because in the context only precision is relevant
 
-    long size = bbox.size()/(2*SPACE_DIM);
-    for (int i=0; i<size; i++)
+    std::size_t size = bbox.size()/(2*SPACE_DIM);
+    for (std::size_t i=0; i<size; i++)
       {
         for(int idim=0; idim<SPACE_DIM; idim++)
           {

diff --git a/src/INTERP_KERNEL/Interpolation3D1D.cxx b/src/INTERP_KERNEL/Interpolation3D1D.cxx
index da03d877563087707051b946a9590cb8dc6dfbc3..faa65ec42603d04c926b129058a412cfdbc93661 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation3D1D.cxx
+++ b/src/INTERP_KERNEL/Interpolation3D1D.cxx
@@ -45,8 +45,8 @@ namespace INTERP_KERNEL
     const double adj = getBoundingBoxAdjustmentAbs();
     const double adjRel = getBoundingBoxAdjustment();
 
-    long size = bbox.size()/(2*SPACE_DIM);
-    for (int i=0; i<size; i++)
+    std::size_t size = bbox.size()/(2*SPACE_DIM);
+    for (std::size_t i=0; i<size; i++)
       {
         double max=- std::numeric_limits<double>::max();
         for(int idim=0; idim<SPACE_DIM; idim++)

diff --git a/src/INTERP_KERNELTest/InterpolationPlanarTestSuite.hxx b/src/INTERP_KERNELTest/InterpolationPlanarTestSuite.hxx
index 0c57c80ba1b7020e713b46430426da2c6a08900d..1e7966b959c01c4b591b613cd84dc7fc3beb4520 100644 (file)
--- a/src/INTERP_KERNELTest/InterpolationPlanarTestSuite.hxx
+++ b/src/INTERP_KERNELTest/InterpolationPlanarTestSuite.hxx
@@ -59,12 +59,12 @@ namespace INTERP_TEST
     bool checkDequesEqual(std::deque< double > deque1,  
                           std::deque< double > deque2, double epsilon)
     {
-      int size1 = deque1.size();
-      int size2 = deque2.size();
+      std::size_t size1 = deque1.size();
+      std::size_t size2 = deque2.size();
       bool are_equal = size1 == size2;
     
       if(are_equal)
-        for(int i = 0; i < size1 && are_equal; i++)
+        for(std::size_t i = 0; i < size1 && are_equal; i++)
           are_equal = fabs(deque1[i] - deque2[i]) < epsilon;
       
       return are_equal; 
@@ -72,19 +72,19 @@ namespace INTERP_TEST
     bool checkVectorsEqual(std::vector< double > vect1,  
                            std::vector< double > vect2, double epsilon)
     {
-      int size1 = vect1.size();
-      int size2 = vect2.size();
+      std::size_t size1 = vect1.size();
+      std::size_t size2 = vect2.size();
       bool are_equal = size1 == size2;
       
       if(are_equal)
-        for(int i = 0; i < size1 && are_equal; i++)
+        for(std::size_t i = 0; i < size1 && are_equal; i++)
           are_equal = fabs(vect1[i] - vect2[i]) < epsilon;
       
       return are_equal; 
     }
     void dequePrintOut(std::deque< double > deque1)
     {
-      for(int i = 0; i< (int)deque1.size(); i++)
+      for(std::size_t i = 0; i< deque1.size(); i++)
         {
           std::cerr << deque1[i] << " ";
         }
@@ -92,7 +92,7 @@ namespace INTERP_TEST
     }
     void vectPrintOut(std::vector< double > vect)
     {
-      for(int i = 0; i< (int)vect.size(); i++)
+      for(std::size_t i = 0; i< vect.size(); i++)
         {
           std::cerr << vect[i] << " ";
         }