ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-30 02:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
dmv 2008-12-30 14:11:08 +00:00
parent 064a124120
commit 3d3be0ce81
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/DriverUNV/UNV_Utilities.hxx
View File

@ -30,6 +30,7 @@
#include <string> #include <string>
#include <stdexcept> #include <stdexcept>
#include <cassert> #include <cassert>
#include <cstdlib>
namespace UNV{ namespace UNV{
class MESHDRIVERUNV_EXPORT PrefixPrinter{ class MESHDRIVERUNV_EXPORT PrefixPrinter{

6
src/MEFISTO2/aptrte.h
View File

@ -28,14 +28,14 @@
#ifndef aptrte__h #ifndef aptrte__h
#define aptrte__h #define aptrte__h
#include <limits.h> // limites min max int long real ... #include <climits> // limites min max int long real ...
#ifndef WIN32 #ifndef WIN32
#include <unistd.h> // gethostname, ... #include <unistd.h> // gethostname, ...
#endif #endif
#include <stdio.h> #include <stdio.h>
#ifndef WIN32 #ifndef WIN32
#include <iostream.h> // pour cout cin ... #include <iostream> // pour cout cin ...
#include <iomanip.h> // pour le format des io setw, stx, setfill, ... #include <iomanip> // pour le format des io setw, stx, setfill, ...
#endif #endif
#include <string.h> // pour les fonctions sur les chaines de caracteres #include <string.h> // pour les fonctions sur les chaines de caracteres
#include <ctype.h> #include <ctype.h>

2
src/SMESH/Makefile.am
View File

@ -81,11 +81,11 @@ dist_libSMESHimpl_la_SOURCES = \
# additionnal information to compile and link file # additionnal information to compile and link file
libSMESHimpl_la_CPPFLAGS = \ libSMESHimpl_la_CPPFLAGS = \
$(CAS_CPPFLAGS) \
$(KERNEL_CXXFLAGS) \ $(KERNEL_CXXFLAGS) \
$(MED_CXXFLAGS) \ $(MED_CXXFLAGS) \
$(GEOM_CXX_FLAGS) \ $(GEOM_CXX_FLAGS) \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
$(CAS_CPPFLAGS) \
@HDF5_INCLUDES@ \ @HDF5_INCLUDES@ \
-I$(srcdir)/../Controls \ -I$(srcdir)/../Controls \
-I$(srcdir)/../Driver \ -I$(srcdir)/../Driver \

1
src/SMESH/SMESH_Mesh.cxx
View File

@ -49,6 +49,7 @@
#include "DriverUNV_R_SMDS_Mesh.h" #include "DriverUNV_R_SMDS_Mesh.h"
#include "DriverSTL_R_SMDS_Mesh.h" #include "DriverSTL_R_SMDS_Mesh.h"
#undef _Precision_HeaderFile
#include <BRepPrimAPI_MakeBox.hxx> #include <BRepPrimAPI_MakeBox.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>

6
src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
View File

@ -88,7 +88,7 @@ using namespace std;
namespace SMESH { 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 // for reverse connectivity of other types keeping the first id, see
// void SMESH_VisualObjDef::buildElemPrs() in SMESH_Object.cxx:900 // void SMESH_VisualObjDef::buildElemPrs() in SMESH_Object.cxx:900
@ -136,7 +136,7 @@ namespace SMESH {
reverse( ids.begin(), ids.end() ); reverse( ids.begin(), ids.end() );
} }
else { else {
vector<int> aRevIds( ids.size() ); vector<vtkIdType> aRevIds( ids.size() );
for ( int i = 0; i < ids.size(); i++) for ( int i = 0; i < ids.size(); i++)
aRevIds[ i ] = ids[ conn[ i ]]; aRevIds[ i ] = ids[ conn[ i ]];
ids = aRevIds; ids = aRevIds;
@ -651,7 +651,7 @@ void SMESHGUI_AddQuadraticElementDlg::ClickOnApply()
BusyLocker lock( myBusy ); BusyLocker lock( myBusy );
vector<int> anIds; vector<vtkIdType> anIds;
switch (myType) { switch (myType) {
case QUAD_EDGE: case QUAD_EDGE: