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
/
SMESHDS
/
SMESHDS_SubMesh.hxx
diff --git
a/src/SMESHDS/SMESHDS_SubMesh.hxx
b/src/SMESHDS/SMESHDS_SubMesh.hxx
index 3a31915c44685922bbc9f7dff3d3c0ef46bc73c0..8550561aaef3f15b7080a7df0afbdcfe0a31651c 100644
(file)
--- a/
src/SMESHDS/SMESHDS_SubMesh.hxx
+++ b/
src/SMESHDS/SMESHDS_SubMesh.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
@@
-31,6
+31,7
@@
#include "SMDS_ElementHolder.hxx"
#include "SMDS_Mesh.hxx"
#include "SMDS_ElementHolder.hxx"
#include "SMDS_Mesh.hxx"
+#include <smIdType.hxx>
#include <vector>
#include <boost/container/flat_set.hpp>
#include <vector>
#include <boost/container/flat_set.hpp>
@@
-62,12
+63,12
@@
class SMESHDS_EXPORT SMESHDS_SubMesh : public SMDS_ElementHolder
bool RemoveSubMesh( const SMESHDS_SubMesh* theSubMesh );
void RemoveAllSubmeshes();
bool ContainsSubMesh( const SMESHDS_SubMesh* theSubMesh ) const;
bool RemoveSubMesh( const SMESHDS_SubMesh* theSubMesh );
void RemoveAllSubmeshes();
bool ContainsSubMesh( const SMESHDS_SubMesh* theSubMesh ) const;
-
int
NbSubMeshes() const { return mySubMeshes.size(); }
+
size_t
NbSubMeshes() const { return mySubMeshes.size(); }
SMESHDS_SubMeshIteratorPtr GetSubMeshIterator() const;
// for both types
SMESHDS_SubMeshIteratorPtr GetSubMeshIterator() const;
// for both types
- virtual
int
NbElements() const;
- virtual
int
NbNodes() const;
+ virtual
smIdType
NbElements() const;
+ virtual
smIdType
NbNodes() const;
virtual SMDS_ElemIteratorPtr GetElements() const;
virtual SMDS_NodeIteratorPtr GetNodes() const;
virtual bool Contains(const SMDS_MeshElement * ME) const; // check if elem or node is in
virtual SMDS_ElemIteratorPtr GetElements() const;
virtual SMDS_NodeIteratorPtr GetNodes() const;
virtual bool Contains(const SMDS_MeshElement * ME) const; // check if elem or node is in
@@
-89,8
+90,8
@@
class SMESHDS_EXPORT SMESHDS_SubMesh : public SMDS_ElementHolder
private:
int myIndex;
private:
int myIndex;
-
int
myNbElements;
-
int
myNbNodes;
+
smIdType
myNbElements;
+
smIdType
myNbNodes;
const SMDS_MeshElement* my1stElemNode[2]; // elem and node with least ID, to optimize iteration
const SMESHDS_Mesh * myParent;
TSubMeshSet mySubMeshes;
const SMDS_MeshElement* my1stElemNode[2]; // elem and node with least ID, to optimize iteration
const SMESHDS_Mesh * myParent;
TSubMeshSet mySubMeshes;