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
Fix pb of make test
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_Object.h
diff --git
a/src/OBJECT/SMESH_Object.h
b/src/OBJECT/SMESH_Object.h
index 5ce10b850076b6a3e73507336d4e6e188b0cdd0f..34f9e91fd37c87c7b61fbc6ac17ad74f5d1bd43c 100644
(file)
--- a/
src/OBJECT/SMESH_Object.h
+++ b/
src/OBJECT/SMESH_Object.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-24,12
+24,11
@@
// File : SMESH_Object.h
// Author : Nicolas REJNERI
// Module : SMESH
// File : SMESH_Object.h
// Author : Nicolas REJNERI
// Module : SMESH
-// $Header$
//
#ifndef SMESH_OBJECT_H
#define SMESH_OBJECT_H
//
#ifndef SMESH_OBJECT_H
#define SMESH_OBJECT_H
-#ifdef W
NT
+#ifdef W
IN32
#if defined SMESHOBJECT_EXPORTS || defined SMESHObject_EXPORTS
#define SMESHOBJECT_EXPORT __declspec( dllexport )
#else
#if defined SMESHOBJECT_EXPORTS || defined SMESHObject_EXPORTS
#define SMESHOBJECT_EXPORT __declspec( dllexport )
#else
@@
-45,6
+44,9
@@
#include "SMESH_Controls.hxx"
#include "SMDSAbs_ElementType.hxx"
#include "SMESH_Controls.hxx"
#include "SMDSAbs_ElementType.hxx"
+#include <SALOMEconfig.h>
+#include CORBA_SERVER_HEADER(SMESH_Mesh)
+
class SMDS_Mesh;
class vtkUnstructuredGrid;
class SMDS_Mesh;
class vtkUnstructuredGrid;
@@
-62,6
+64,7
@@
public:
virtual int GetNbEntities( const SMDSAbs_ElementType theType) const = 0;
virtual SMDS_Mesh* GetMesh() const = 0;
virtual int GetNbEntities( const SMDSAbs_ElementType theType) const = 0;
virtual SMDS_Mesh* GetMesh() const = 0;
+ virtual SMESH::SMESH_Mesh_ptr GetMeshServer() = 0;
virtual bool GetEdgeNodes( const int theElemId,
const int theEdgeNum,
virtual bool GetEdgeNodes( const int theElemId,
const int theEdgeNum,