mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-01-14 02:30:33 +05:00
0020062: [CEA 295] Type coherence in *.i files
This commit is contained in:
parent
064a124120
commit
3d3be0ce81
@ -30,6 +30,7 @@
|
||||
#include <string>
|
||||
#include <stdexcept>
|
||||
#include <cassert>
|
||||
#include <cstdlib>
|
||||
|
||||
namespace UNV{
|
||||
class MESHDRIVERUNV_EXPORT PrefixPrinter{
|
||||
|
@ -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>
|
||||
|
@ -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 \
|
||||
|
@ -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>
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user