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
Temporary rollback ASCII load/save for smesh
[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 3fca4373c7318e74aaf4db89d4e30b7045f4e0db..808b07cb68d21dad3197e91aebb8dbf8e3f0e47e 100644
(file)
--- a/
src/SMESH_I/SMESH_subMesh_i.hxx
+++ b/
src/SMESH_I/SMESH_subMesh_i.hxx
@@
-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)
@@
-40,7
+42,7
@@
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
+66,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()