Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bos #20256: [CEA 18523] Porting SMESH to int 64 bits
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_FaceSide.hxx
diff --git
a/src/StdMeshers/StdMeshers_FaceSide.hxx
b/src/StdMeshers/StdMeshers_FaceSide.hxx
index 1964638fea6b65467a415bc6fff2a38d092b529b..72e7b99b834fb76c416087897ec47a345c17f27d 100644
(file)
--- a/
src/StdMeshers/StdMeshers_FaceSide.hxx
+++ b/
src/StdMeshers/StdMeshers_FaceSide.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-109,7
+109,7
@@
public:
~StdMeshers_FaceSide();
~StdMeshers_FaceSide();
- // static "cons
rt
uctors"
+ // static "cons
tr
uctors"
static StdMeshers_FaceSidePtr New(const TopoDS_Face& Face,
const TopoDS_Edge& Edge,
SMESH_Mesh* Mesh,
static StdMeshers_FaceSidePtr New(const TopoDS_Face& Face,
const TopoDS_Edge& Edge,
SMESH_Mesh* Mesh,
@@
-172,13
+172,13
@@
public:
* Call it with update == true if mesh of this side can be recomputed
* since creation of this side
*/
* Call it with update == true if mesh of this side can be recomputed
* since creation of this side
*/
-
int
NbPoints(const bool update = false) const;
+
smIdType
NbPoints(const bool update = false) const;
/*!
* \brief Return nb edges
* Call it with update == true if mesh of this side can be recomputed
* since creation of this side
*/
/*!
* \brief Return nb edges
* Call it with update == true if mesh of this side can be recomputed
* since creation of this side
*/
-
int
NbSegments(const bool update = false) const;
+
smIdType
NbSegments(const bool update = false) const;
/*!
* \brief Return mesh
*/
/*!
* \brief Return mesh
*/
@@
-207,7
+207,7
@@
public:
double constValue = 0) const;
/*!
* \brief Return nodes in the order they encounter while walking along
double constValue = 0) const;
/*!
* \brief Return nodes in the order they encounter while walking along
- * the wh
i
le side or a specified EDGE. For a closed side, the 1st point repeats at end.
+ * the wh
o
le side or a specified EDGE. For a closed side, the 1st point repeats at end.
* \param iE - index of the EDGE. Default is "all EDGEs".
*/
std::vector<const SMDS_MeshNode*> GetOrderedNodes( int iE = ALL_EDGES ) const;
* \param iE - index of the EDGE. Default is "all EDGEs".
*/
std::vector<const SMDS_MeshNode*> GetOrderedNodes( int iE = ALL_EDGES ) const;
@@
-255,7
+255,7
@@
public:
/*!
* \brief Return nb of wrapped edges
*/
/*!
* \brief Return nb of wrapped edges
*/
- int NbEdges() const { return myEdge.size(); }
+ int NbEdges() const { return
(int)
myEdge.size(); }
/*!
* \brief Return i-th edge (count starts from zero)
*/
/*!
* \brief Return i-th edge (count starts from zero)
*/
@@
-346,7
+346,7
@@
protected:
std::vector<double> myEdgeLength;
std::vector<int> myIsUniform;
double myLength;
std::vector<double> myEdgeLength;
std::vector<int> myIsUniform;
double myLength;
-
int
myNbPonits, myNbSegments;
+
smIdType
myNbPonits, myNbSegments;
SMESH_ProxyMesh::Ptr myProxyMesh;
bool myMissingVertexNodes, myIgnoreMediumNodes;
gp_Pnt2d myDefaultPnt2d;
SMESH_ProxyMesh::Ptr myProxyMesh;
bool myMissingVertexNodes, myIgnoreMediumNodes;
gp_Pnt2d myDefaultPnt2d;
@@
-364,7
+364,7
@@
protected:
inline int StdMeshers_FaceSide::EdgeIndex( double U ) const
{
inline int StdMeshers_FaceSide::EdgeIndex( double U ) const
{
- int i = myNormPar.size() - 1;
+ int i =
(int)
myNormPar.size() - 1;
while ( i > 0 && U < myNormPar[ i-1 ] ) --i;
return i;
}
while ( i > 0 && U < myNormPar[ i-1 ] ) --i;
return i;
}