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_Pattern_i.hxx
diff --git
a/src/SMESH_I/SMESH_Pattern_i.hxx
b/src/SMESH_I/SMESH_Pattern_i.hxx
index 29b5084cdf5c8b3818760f6ebad442285c5d1fe4..7a5a92cbfa1a495d8c1b8634d9100ea692ec1741 100644
(file)
--- a/
src/SMESH_I/SMESH_Pattern_i.hxx
+++ b/
src/SMESH_I/SMESH_Pattern_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
//
//
//
//
//
//
@@
-30,6
+30,8
@@
#ifndef SMESH_Pattern_I_HeaderFile
#define SMESH_Pattern_I_HeaderFile
#ifndef SMESH_Pattern_I_HeaderFile
#define SMESH_Pattern_I_HeaderFile
+#include "SMESH.hxx"
+
#include "SALOMEconfig.h"
#include CORBA_SERVER_HEADER(SMESH_Pattern)
#include CORBA_SERVER_HEADER(SMESH_Mesh)
#include "SALOMEconfig.h"
#include CORBA_SERVER_HEADER(SMESH_Pattern)
#include CORBA_SERVER_HEADER(SMESH_Mesh)
@@
-41,7
+43,7
@@
class SMESH_Gen_i;
class SMESH_Mesh;
class SMESH_Gen_i;
class SMESH_Mesh;
-class SMESH_Pattern_i:
+class SMESH_
I_EXPORT SMESH_
Pattern_i:
public virtual POA_SMESH::SMESH_Pattern
{
public:
public virtual POA_SMESH::SMESH_Pattern
{
public:
@@
-75,9
+77,14
@@
class SMESH_Pattern_i:
CORBA::Long theNode000Index,
CORBA::Long theNode001Index);
CORBA::Long theNode000Index,
CORBA::Long theNode001Index);
- CORBA::Boolean MakeMesh (SMESH::SMESH_Mesh_ptr theMesh,
+ //for omniORB conflict compilation
+ /*CORBA::Boolean MakeMesh (SMESH::SMESH_Mesh_ptr theMesh,
const CORBA::Boolean CreatePolygons,
const CORBA::Boolean CreatePolygons,
- const CORBA::Boolean CreatePolyedrs);
+ const CORBA::Boolean CreatePolyedrs);*/
+
+ CORBA::Boolean MakeMesh (SMESH::SMESH_Mesh_ptr theMesh,
+ CORBA::Boolean CreatePolygons,
+ CORBA::Boolean CreatePolyedrs);
SMESH::SMESH_Pattern::ErrorCode GetErrorCode();
SMESH::SMESH_Pattern::ErrorCode GetErrorCode();