From: dmv <dmv@opencascade.com>
Date: Tue, 30 Dec 2008 14:11:08 +0000 (+0000)
Subject: 0020062: [CEA 295] Type coherence in *.i files
X-Git-Tag: V4_1_5rc1~49
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3d3be0ce813137c8a0ee2803aed399029ce3bb8c;p=modules%2Fsmesh.git

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

diff --git a/src/DriverUNV/UNV_Utilities.hxx b/src/DriverUNV/UNV_Utilities.hxx
index 891f18720..2f1e8269e 100644
--- 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{
   class MESHDRIVERUNV_EXPORT PrefixPrinter{
diff --git a/src/MEFISTO2/aptrte.h b/src/MEFISTO2/aptrte.h
index ab407ec89..68fb0e63a 100755
--- 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/Makefile.am b/src/SMESH/Makefile.am
index 11a0ca58e..782a17a70 100644
--- a/src/SMESH/Makefile.am
+++ b/src/SMESH/Makefile.am
@@ -81,11 +81,11 @@ dist_libSMESHimpl_la_SOURCES = \
 
 # additionnal information to compile and link file
 libSMESHimpl_la_CPPFLAGS = \
+	$(CAS_CPPFLAGS) \
 	$(KERNEL_CXXFLAGS) \
 	$(MED_CXXFLAGS) \
 	$(GEOM_CXX_FLAGS) \
 	$(BOOST_CPPFLAGS) \
-	$(CAS_CPPFLAGS) \
 	@HDF5_INCLUDES@ \
 	-I$(srcdir)/../Controls \
 	-I$(srcdir)/../Driver \
diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx
index 9892eee07..1b2f06bc5 100644
--- 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 dbae53984..cf714ae78 100644
--- a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
@@ -88,7 +88,7 @@ using namespace std;
 
 namespace SMESH {
 
-  void ReverseConnectivity( vector<int> & ids, int type )
+  void ReverseConnectivity( 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
@@ -136,7 +136,7 @@ namespace SMESH {
       reverse( ids.begin(), ids.end() );
     }
     else {
-      vector<int> aRevIds( ids.size() );
+      vector<vtkIdType> aRevIds( ids.size() );
       for ( int i = 0; i < ids.size(); i++)
         aRevIds[ i ] = ids[ conn[ i ]];
       ids = aRevIds;
@@ -651,7 +651,7 @@ void SMESHGUI_AddQuadraticElementDlg::ClickOnApply()
 
   BusyLocker lock( myBusy );
     
-  vector<int> anIds;
+  vector<vtkIdType> anIds;
 
   switch (myType) {
   case QUAD_EDGE: