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
Color Number (Color Group) parameter is returned for compatibility
[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 e8d84b37e734eea52aa0813632159843cae75f2c..154ffd7a2c5fdd6d9faa4a08c9dc85b609bd60ba 100644
(file)
--- a/
src/SMESH_I/SMESH_subMesh_i.hxx
+++ b/
src/SMESH_I/SMESH_subMesh_i.hxx
@@
-17,7
+17,7
@@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-//
See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
//
//
//
@@
-29,6
+29,8
@@
#ifndef _SMESH_SUBMESH_I_HXX_
#define _SMESH_SUBMESH_I_HXX_
#ifndef _SMESH_SUBMESH_I_HXX_
#define _SMESH_SUBMESH_I_HXX_
+#include "SMESH.hxx"
+
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
#include CORBA_SERVER_HEADER(SMESH_Hypothesis)
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
#include CORBA_SERVER_HEADER(SMESH_Hypothesis)
@@
-36,11
+38,12
@@
#include CORBA_CLIENT_HEADER(MED)
#include "SALOME_GenericObj_i.hh"
#include CORBA_CLIENT_HEADER(MED)
#include "SALOME_GenericObj_i.hh"
+#include "SMESH_Mesh_i.hxx"
class SMESH_Gen_i;
class SMESH_Mesh_i;
class SMESH_Gen_i;
class SMESH_Mesh_i;
-class SMESH_subMesh_i:
+class SMESH_
I_EXPORT SMESH_
subMesh_i:
public virtual POA_SMESH::SMESH_subMesh,
public virtual SALOME::GenericObj_i
{
public virtual POA_SMESH::SMESH_subMesh,
public virtual SALOME::GenericObj_i
{
@@
-64,7
+67,10
@@
public:
SMESH::long_array* GetElementsByType( SMESH::ElementType theElemType )
throw (SALOME::SALOME_Exception);
SMESH::long_array* GetElementsByType( SMESH::ElementType theElemType )
throw (SALOME::SALOME_Exception);
- SMESH::ElementType GetElementType( const CORBA::Long id, const bool iselem )
+ //for omniORB conflict compilation
+ /*SMESH::ElementType GetElementType( const CORBA::Long id, const bool iselem )
+ throw (SALOME::SALOME_Exception);*/
+ SMESH::ElementType GetElementType( CORBA::Long id, bool iselem )
throw (SALOME::SALOME_Exception);
SMESH::long_array* GetNodesId()
throw (SALOME::SALOME_Exception);
SMESH::long_array* GetNodesId()
@@
-86,8
+92,11
@@
public:
SMESH_Mesh_i* _mesh_i; //NRI
protected:
SMESH_Mesh_i* _mesh_i; //NRI
protected:
+ void changeLocalId(int localId) { _localId = localId; }
SMESH_Gen_i* _gen_i;
int _localId;
SMESH_Gen_i* _gen_i;
int _localId;
+
+ friend void SMESH_Mesh_i::CheckGeomGroupModif();
};
#endif
};
#endif