Correction due to new inheritance of some interfaces from MED.idl

diff --git a/src/SMESH_I/SMESH_MEDMesh_i.hxx b/src/SMESH_I/SMESH_MEDMesh_i.hxx
index 3e8fe7a35f49d93fbea05a845c2d709ecd4eae39..e76c5cd3622ca66abde6af1c117c0592bcba0896 100644 (file)
--- a/src/SMESH_I/SMESH_MEDMesh_i.hxx
+++ b/src/SMESH_I/SMESH_MEDMesh_i.hxx
@@ -37,6 +37,7 @@
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"

+#include "SALOME_GenericObj_i.hh"

 
 #define MED_NBR_GEOMETRIE_MAILLE 15
 #define MED_NBR_TYPE 5
 
 #define MED_NBR_GEOMETRIE_MAILLE 15
 #define MED_NBR_TYPE 5


@@ -44,7 +45,7 @@
 class SMESH_Mesh_i;
 
 class SMESH_MEDMesh_i:
 class SMESH_Mesh_i;
 
 class SMESH_MEDMesh_i:

-       public POA_SALOME_MED::MESH, public PortableServer::RefCountServantBase
+       public virtual POA_SALOME_MED::MESH, public virtual SALOME::GenericObj_i

 {
   public: private: protected:
        // C++ object containing values
 {
   public: private: protected:
        // C++ object containing values

diff --git a/src/SMESH_I/SMESH_MEDSupport_i.hxx b/src/SMESH_I/SMESH_MEDSupport_i.hxx
index 5be60dda40e76743c8110b3b4d7bde3168ed6334..c888661b6e49ba0e2e204006b2dfadd5fba36185 100644 (file)
--- a/src/SMESH_I/SMESH_MEDSupport_i.hxx
+++ b/src/SMESH_I/SMESH_MEDSupport_i.hxx
@@ -37,11 +37,11 @@
 #include "SMDS_MeshNode.hxx"
 
 #include "SMESH_MEDSupport_i.hxx"
 #include "SMDS_MeshNode.hxx"
 
 #include "SMESH_MEDSupport_i.hxx"

-
+#include "SALOME_GenericObj_i.hh"

 class SMESH_subMesh_i;
 
 class SMESH_MEDSupport_i:
 class SMESH_subMesh_i;
 
 class SMESH_MEDSupport_i:

-       public POA_SALOME_MED::SUPPORT, public PortableServer::RefCountServantBase
+       public virtual POA_SALOME_MED::SUPPORT, public virtual SALOME::GenericObj_i

 {
   public:
 
 {
   public: