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
/
SMESH_I
/
SMESH_subMesh_i.hxx
diff --git
a/src/SMESH_I/SMESH_subMesh_i.hxx
b/src/SMESH_I/SMESH_subMesh_i.hxx
index f782031e63772b3c4d4139e165a6b31ce6916356..3cb96e8788aedbd42488792d5203c2c99a11b896 100644
(file)
--- a/
src/SMESH_I/SMESH_subMesh_i.hxx
+++ b/
src/SMESH_I/SMESH_subMesh_i.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19
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
@@
-53,29
+53,21
@@
public:
int localId );
~SMESH_subMesh_i();
int localId );
~SMESH_subMesh_i();
- CORBA::Long GetNumberOfElements()
- throw (SALOME::SALOME_Exception);
+ SMESH::smIdType GetNumberOfElements();
- CORBA::Long GetNumberOfNodes( CORBA::Boolean all )
- throw (SALOME::SALOME_Exception);
+ SMESH::smIdType GetNumberOfNodes( CORBA::Boolean all );
- SMESH::long_array* GetElementsId()
- throw (SALOME::SALOME_Exception);
+ SMESH::smIdType_array* GetElementsId();
- SMESH::long_array* GetElementsByType( SMESH::ElementType theElemType )
- throw (SALOME::SALOME_Exception);
+ SMESH::smIdType_array* GetElementsByType( SMESH::ElementType theElemType );
- SMESH::ElementType GetElementType( CORBA::Long id, bool iselem )
- throw (SALOME::SALOME_Exception);
+ SMESH::ElementType GetElementType( SMESH::smIdType id, bool iselem );
- SMESH::long_array* GetNodesId()
- throw (SALOME::SALOME_Exception);
+ SMESH::smIdType_array* GetNodesId();
- SMESH::SMESH_Mesh_ptr GetFather()
- throw (SALOME::SALOME_Exception);
+ SMESH::SMESH_Mesh_ptr GetFather();
- GEOM::GEOM_Object_ptr GetSubShape()
- throw (SALOME::SALOME_Exception);
+ GEOM::GEOM_Object_ptr GetSubShape();
CORBA::Long GetId();
CORBA::Long GetId();
@@
-86,17
+78,17
@@
public:
/*!
* Returns a sequence of all element IDs
*/
/*!
* Returns a sequence of all element IDs
*/
- virtual SMESH::
long
_array* GetIDs();
+ virtual SMESH::
smIdType
_array* GetIDs();
/*!
* Returns number of mesh elements of each \a EntityType
* Result array of number of elements per \a EntityType
* Inherited from SMESH_IDSource
*/
/*!
* Returns number of mesh elements of each \a EntityType
* Result array of number of elements per \a EntityType
* Inherited from SMESH_IDSource
*/
- virtual SMESH::
long
_array* GetMeshInfo();
+ virtual SMESH::
smIdType
_array* GetMeshInfo();
/*!
* Returns number of mesh elements of each \a ElementType
*/
/*!
* Returns number of mesh elements of each \a ElementType
*/
- virtual SMESH::
long
_array* GetNbElementsByType();
+ virtual SMESH::
smIdType
_array* GetNbElementsByType();
/*!
* Returns types of elements it contains
*/
/*!
* Returns types of elements it contains
*/
@@
-123,6
+115,7
@@
protected:
void changeLocalId(int localId) { _localId = localId; }
friend void SMESH_Mesh_i::CheckGeomGroupModif();
void changeLocalId(int localId) { _localId = localId; }
friend void SMESH_Mesh_i::CheckGeomGroupModif();
+ friend void SMESH_Mesh_i::CheckGeomModif(bool);
SMESH_PreMeshInfo* _preMeshInfo; // mesh info before full loading from study file
SMESH_PreMeshInfo* _preMeshInfo; // mesh info before full loading from study file
@@
-143,8
+136,7
@@
class SMESH_I_EXPORT SMESH_Invalid_subMesh_i:
int localId,
GEOM::GEOM_Object_ptr shape);
int localId,
GEOM::GEOM_Object_ptr shape);
- virtual GEOM::GEOM_Object_ptr GetSubShape()
- throw (SALOME::SALOME_Exception);
+ virtual GEOM::GEOM_Object_ptr GetSubShape();
protected:
protected: