0020062: [CEA 295] Type coherence in *.i files

diff --git a/src/DriverUNV/UNV_Utilities.hxx b/src/DriverUNV/UNV_Utilities.hxx
index 0707c8e629d2b0d580a4f571f4f4731d9f7ca1c2..e53f75d95da120a9dd3cff3c5cb87e9117a0e313 100644 (file)
--- a/src/DriverUNV/UNV_Utilities.hxx
+++ b/src/DriverUNV/UNV_Utilities.hxx
@@ -30,6 +30,7 @@
 #include <string>
 #include <stdexcept>
 #include <cassert>
+#include <cstdlib>
 
 namespace UNV{
   using namespace std;

diff --git a/src/MEFISTO2/aptrte.h b/src/MEFISTO2/aptrte.h
index ab407ec89a46b03b1992eb3d2666ab4c4b074837..68fb0e63ac414a1e6681d4953592a658fbe459e4 100755 (executable)
--- a/src/MEFISTO2/aptrte.h
+++ b/src/MEFISTO2/aptrte.h
@@ -28,14 +28,14 @@
 #ifndef aptrte__h
 #define aptrte__h
 
-#include <limits.h>   // limites min max int long real ...
+#include <climits>   // limites min max int long real ...
 #ifndef WIN32
 #include <unistd.h>   // gethostname, ...
 #endif
 #include <stdio.h>
 #ifndef WIN32
-#include <iostream.h> // pour cout cin ...
-#include <iomanip.h>  // pour le format des io setw, stx, setfill, ...
+#include <iostream> // pour cout cin ...
+#include <iomanip>  // pour le format des io setw, stx, setfill, ...
 #endif
 #include <string.h>   // pour les fonctions sur les chaines de caracteres
 #include <ctype.h>

diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx
index 4f2110a35501acd15fa31bbc4fb038ce3d107860..4479c7de8cb0e119cf695fd25ca09247d3659ea2 100644 (file)
--- a/src/SMESH/SMESH_Mesh.cxx
+++ b/src/SMESH/SMESH_Mesh.cxx
@@ -49,6 +49,7 @@
 #include "DriverUNV_R_SMDS_Mesh.h"
 #include "DriverSTL_R_SMDS_Mesh.h"
 
+#undef _Precision_HeaderFile
 #include <BRepPrimAPI_MakeBox.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>

diff --git a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
index a87981724a859a0aa5f8d79e5640eb3a2bb42736..1c3106e735eb3c1ed149aceebfa603bd56d8d136 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
@@ -90,7 +90,7 @@
 
 namespace SMESH
 {
-  void ReverseConnectivity( std::vector<int> & ids, int type )
+  void ReverseConnectivity( std::vector<vtkIdType> & ids, int type )
   {
     // for reverse connectivity of other types keeping the first id, see
     // void SMESH_VisualObjDef::buildElemPrs() in SMESH_Object.cxx:900
@@ -138,7 +138,7 @@ namespace SMESH
       reverse( ids.begin(), ids.end() );
     }
     else {
-      std::vector<int> aRevIds( ids.size() );
+      std::vector<vtkIdType> aRevIds( ids.size() );
       for ( int i = 0; i < ids.size(); i++)
         aRevIds[ i ] = ids[ conn[ i ]];
       ids = aRevIds;
@@ -666,7 +666,7 @@ void SMESHGUI_AddQuadraticElementDlg::ClickOnApply()
 
   BusyLocker lock( myBusy );
 
-  std::vector<int> anIds;
+  std::vector<vtkIdType> anIds;
 
   switch (myType) {
   case QUAD_EDGE: