Integrate missing files

diff --git a/src/Communication/SALOME_Comm_i.hxx b/src/Communication/SALOME_Comm_i.hxx
index 4bcde2ef4258457ae6b6b4029fa73c601b653484..6664fc4c08bbadaef10c0fdd049ee073b96966f7 100644 (file)
--- a/src/Communication/SALOME_Comm_i.hxx
+++ b/src/Communication/SALOME_Comm_i.hxx
@@ -36,8 +36,8 @@
   Generic servant class for senders that factorizes all the common methods and attributes necessary to senders.
   All servant classes for senders have to inheritate from it.
  */
-class COMMUNICATION_EXPORT SALOME_Sender_i : public virtual POA_SALOME::Sender,
-                       public PortableServer::RefCountServantBase {
+class COMMUNICATION_EXPORT SALOME_Sender_i : public virtual POA_SALOME::Sender
+{
 protected:
   /*! Pointer to the generic array to transmit*/
   const void *_tabToSend;

diff --git a/src/Communication/SALOME_Matrix_i.hxx b/src/Communication/SALOME_Matrix_i.hxx
index 3b3d33af7d70e42752dca92211d1ebf7ce8d18d1..26e8729a84e369f6633a4b22efb677ad99bb0e68 100644 (file)
--- a/src/Communication/SALOME_Matrix_i.hxx
+++ b/src/Communication/SALOME_Matrix_i.hxx
@@ -24,8 +24,8 @@
 #include CORBA_SERVER_HEADER(SALOME_Comm)
 #include "SALOMEMultiComm.hxx"
 
-class SALOME_Matrix_i : public virtual POA_SALOME::Matrix,
-                       public PortableServer::RefCountServantBase {
+class SALOME_Matrix_i : public virtual POA_SALOME::Matrix
+{
 private:
   const double *_tabToSend;
   int _nbOfRow;

diff --git a/src/Container/SALOME_Component_i.hxx b/src/Container/SALOME_Component_i.hxx
index 5107cb59e61be08296a5db86e36b1bd85f73c599..3bd3f85d09dee9bd6bcba10adfa6b61116cb0989 100644 (file)
--- a/src/Container/SALOME_Component_i.hxx
+++ b/src/Container/SALOME_Component_i.hxx
@@ -49,7 +49,7 @@ class Engines_Container_i;
 
 class CONTAINER_EXPORT Engines_Component_i: 
   public virtual POA_Engines::Component,
-  public virtual PortableServer::RefCountServantBase
+  public virtual PortableServer::ServantBase
 {
 public:
   Engines_Component_i();

diff --git a/src/Container/SALOME_ContainerManager.hxx b/src/Container/SALOME_ContainerManager.hxx
index d74988084cc78050d98abce9a0da77aa2b963d65..a84a99f9897c3728036d830cf899311ed63c328d 100644 (file)
--- a/src/Container/SALOME_ContainerManager.hxx
+++ b/src/Container/SALOME_ContainerManager.hxx
@@ -33,8 +33,7 @@
 class SALOME_NamingService;
 
 class CONTAINER_EXPORT SALOME_ContainerManager:
-  public POA_Engines::ContainerManager,
-  public PortableServer::RefCountServantBase
+  public POA_Engines::ContainerManager
 {
 
 public:

diff --git a/src/Container/SALOME_Container_i.hxx b/src/Container/SALOME_Container_i.hxx
index 181c4f84e9dedaf38c253b3e126ac69d60e7ffaf..fe32eba833a6861eff225314225f5a4aee6706a3 100644 (file)
--- a/src/Container/SALOME_Container_i.hxx
+++ b/src/Container/SALOME_Container_i.hxx
@@ -49,7 +49,7 @@ class SALOME_NamingService;
 
 class CONTAINER_EXPORT Engines_Container_i:
   public virtual POA_Engines::Container,
-  public virtual PortableServer::RefCountServantBase
+  public virtual PortableServer::ServantBase
 {
 public:
   Engines_Container_i();

diff --git a/src/Container/SALOME_FileRef_i.hxx b/src/Container/SALOME_FileRef_i.hxx
index 61b3f52f2edf344c19399918b7301cc079570eee..3e32964a53025dffdf256f80f97113650e8cf754 100644 (file)
--- a/src/Container/SALOME_FileRef_i.hxx
+++ b/src/Container/SALOME_FileRef_i.hxx
@@ -36,7 +36,7 @@
 
 class CONTAINER_EXPORT fileRef_i:
   public virtual POA_Engines::fileRef,
-  public virtual PortableServer::RefCountServantBase
+  public virtual PortableServer::ServantBase
 {
 public:
   fileRef_i();

diff --git a/src/Container/SALOME_FileTransfer_i.hxx b/src/Container/SALOME_FileTransfer_i.hxx
index c0ecb18e6060046386e9c9ae679e20d7671619c0..f35a5582da23c38675d770f3e67dba058cc10eaf 100644 (file)
--- a/src/Container/SALOME_FileTransfer_i.hxx
+++ b/src/Container/SALOME_FileTransfer_i.hxx
@@ -36,7 +36,7 @@
 
 class CONTAINER_EXPORT fileTransfer_i:
   public virtual POA_Engines::fileTransfer,
-  public virtual PortableServer::RefCountServantBase
+  public virtual PortableServer::ServantBase
 {
 public:
   fileTransfer_i();

diff --git a/src/Logger/SALOME_Logger_Server.hxx b/src/Logger/SALOME_Logger_Server.hxx
index 9f7a16a83b5c372f107da0c032cd28825c4e18fd..5b1f13f938b815da616bbcbd9d15b5fe17f05d02 100644 (file)
--- a/src/Logger/SALOME_Logger_Server.hxx
+++ b/src/Logger/SALOME_Logger_Server.hxx
@@ -32,8 +32,7 @@
 
 
 class LOGGER_EXPORT Logger :
-  public POA_SALOME_Logger::Logger,
-  public PortableServer::RefCountServantBase 
+  public POA_SALOME_Logger::Logger
 {
 public:
         //constructor w/o parameters

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx
index c6ce34ea5947bc7d89b57e5e9ad44496b3d6d645..c7b580a177ca6a405ea4101cb8fd4580f94175b4 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx
@@ -36,8 +36,7 @@
 
 #include CORBA_SERVER_HEADER(SALOME_ModuleCatalog)
 
-class MODULECATALOG_EXPORT SALOME_ModuleCatalog_AcomponentImpl: public POA_SALOME_ModuleCatalog::Acomponent,
-                      public PortableServer::RefCountServantBase 
+class MODULECATALOG_EXPORT SALOME_ModuleCatalog_AcomponentImpl: public POA_SALOME_ModuleCatalog::Acomponent
 {
 public:
   //! standard constructor

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx
index 92976b7e3f0c7b425c91d39a58cec350ec984fba..5dad3bacf8040313d3d2ed2875366384e9d5bd88 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx
@@ -40,8 +40,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_ModuleCatalog)
 
-class MODULECATALOG_EXPORT SALOME_ModuleCatalogImpl: public POA_SALOME_ModuleCatalog::ModuleCatalog,
-                               public PortableServer::RefCountServantBase 
+class MODULECATALOG_EXPORT SALOME_ModuleCatalogImpl: public POA_SALOME_ModuleCatalog::ModuleCatalog
 {
 public:
   //! standard constructor

diff --git a/src/NamingService/Test/NamingServiceTest.hxx b/src/NamingService/Test/NamingServiceTest.hxx
index d41ddcae39b5dbc39976c87e06298864603908c9..b471a944994314670b87d2724d4706ccc83753ec 100644 (file)
--- a/src/NamingService/Test/NamingServiceTest.hxx
+++ b/src/NamingService/Test/NamingServiceTest.hxx
@@ -28,7 +28,7 @@
 #include CORBA_SERVER_HEADER(nstest)
 
 class NSTEST_echo_i : public virtual POA_NSTEST::echo,
-                     public virtual PortableServer::RefCountServantBase
+                     public virtual PortableServer::ServantBase
 {
 public:
   NSTEST_echo_i();
@@ -40,7 +40,7 @@ private:
 };
 
 class NSTEST_aFactory_i : public virtual POA_NSTEST::aFactory,
-                         public virtual PortableServer::RefCountServantBase
+                         public virtual PortableServer::ServantBase
 {
 public:
   NSTEST_aFactory_i();

diff --git a/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx b/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx
index 9501817865998917b5aef4178b89387c611e395b..26455a9f30799d7a70bb506f521c453bfdfb3f6d 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx
@@ -35,7 +35,7 @@
 #include <TDF_Label.hxx>
 
 class SALOMEDS_BasicAttribute_i: public POA_SALOMEDS::BasicAttribute,
-                                public PortableServer::RefCountServantBase {
+                                public PortableServer::ServantBase {
 protected:
   TDF_Label _Lab;
 

diff --git a/src/SALOMEDS/SALOMEDS_Callback_i.hxx b/src/SALOMEDS/SALOMEDS_Callback_i.hxx
index ffc6e6db2a1a88e47751ba280960a97d54e75e4b..d6f7554372303cdea3668e8693281b33b6bada7d 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Callback_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_Callback_i.hxx
@@ -16,7 +16,7 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
 class SALOMEDS_Callback_i: public virtual POA_SALOMEDS::Callback,
-                          public virtual PortableServer::RefCountServantBase 
+                          public virtual PortableServer::ServantBase 
 {
 private:
   SALOMEDS::UseCaseBuilder_var _builder;

diff --git a/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx b/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx
index 7092d89f3709cbb5622134435f1458b1fd030cf2..d2af3944d44b874bc5eb9ec2d9a7ef49aaff3e7e 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx
@@ -37,7 +37,7 @@
 #include <stdio.h>
 
 class SALOMEDS_ChildIterator_i: public virtual POA_SALOMEDS::ChildIterator,
-                               public virtual PortableServer::RefCountServantBase,
+                               public virtual PortableServer::ServantBase,
                                public virtual SALOME::GenericObj_i
 {
 private:

diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx
index 32176a41a2965ac42fc09fb2d5d11e44171ce896..093ed285a47bd3f6e1726488e8e71c8565665ff2 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx
@@ -33,7 +33,7 @@
 #include "SALOMEDSImpl_GenericAttribute.hxx"
 
 class Standard_EXPORT SALOMEDS_GenericAttribute_i: public virtual POA_SALOMEDS::GenericAttribute,
-                                  public virtual PortableServer::RefCountServantBase,
+                                  public virtual PortableServer::ServantBase,
                                   public virtual SALOME::GenericObj_i
 {
 

diff --git a/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx b/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx
index 4652d95ee372eb43689791e79a9a94d9ce3ffd41..0b1106ff08a0ad18a7a9cb53d4dbb254e01f7b39 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx
@@ -43,7 +43,7 @@
 #include <stdio.h>
 
 class SALOMEDS_SAttribute_i: public POA_IStudy::SAttribute,
-                       public PortableServer::RefCountServantBase {
+                       public PortableServer::ServantBase {
 private:
   CORBA::ORB_ptr           _orb;
   char*                    _Type;

diff --git a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx
index dba9faad69e02795ac86f5a80212e4e5afe590ca..3335a1a287342a1e97130350d478015d47c0af36 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx
@@ -37,7 +37,7 @@
 #include "SALOMEDSImpl_SComponentIterator.hxx"
 
 class SALOMEDS_SComponentIterator_i:public virtual POA_SALOMEDS::SComponentIterator,
-                                   public virtual PortableServer::RefCountServantBase,
+                                   public virtual PortableServer::ServantBase,
                                    public virtual SALOME::GenericObj_i 
 {
 

diff --git a/src/SALOMEDS/SALOMEDS_SObject_i.hxx b/src/SALOMEDS/SALOMEDS_SObject_i.hxx
index 2a492fc224a688ca60d8c23e055d63e790a7c6e0..b836a2bee151962fd275cb0dccf0ade137eb2bf0 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_SObject_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_SObject_i.hxx
@@ -36,7 +36,7 @@
 #include "SALOMEDSImpl_SObject.hxx"
 
 class Standard_EXPORT SALOMEDS_SObject_i: public virtual POA_SALOMEDS::SObject,
-                         public virtual PortableServer::RefCountServantBase,
+                         public virtual PortableServer::ServantBase,
                          public virtual SALOME::GenericObj_i
 {
 protected:

diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx
index ae6d0e5c527c4755a21fedee210058ca3705fa89..40d5fd18d2d10b7da39b637a028ae3b774aabd62 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx
@@ -37,8 +37,7 @@
 // Cascade header
 #include <TDocStd_Document.hxx>
 
-class SALOMEDS_StudyBuilder_i: public POA_SALOMEDS::StudyBuilder,
-                               public PortableServer::RefCountServantBase 
+class SALOMEDS_StudyBuilder_i: public POA_SALOMEDS::StudyBuilder
 {
 private:
   CORBA::ORB_ptr                    _orb;

diff --git a/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx b/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx
index 31c486f7b29e7b49646d4dfbe7233ee4d56f5de5..9ef1801bb5dfbb31d21bffd4e3b7fbabf83d08d2 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx
@@ -51,8 +51,8 @@ namespace SALOMEDS{
 
 }    
 
-class Standard_EXPORT SALOMEDS_StudyManager_i: public POA_SALOMEDS::StudyManager,
-                              public PortableServer::RefCountServantBase {
+class Standard_EXPORT SALOMEDS_StudyManager_i: public POA_SALOMEDS::StudyManager
+{
 private:
 
   CORBA::ORB_ptr                    _orb;

diff --git a/src/SALOMEDS/SALOMEDS_Study_i.hxx b/src/SALOMEDS/SALOMEDS_Study_i.hxx
index cabc9c648f2030059530674b97dbef2114c16227..0b2a449601078d75028b47db851f8e91f3f39d5b 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Study_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_Study_i.hxx
@@ -43,8 +43,7 @@
 #include "SALOMEDSImpl_Study.hxx"
 #include "SALOMEDSImpl_AttributeIOR.hxx"
 
-class Standard_EXPORT SALOMEDS_Study_i: public POA_SALOMEDS::Study,
-                       public PortableServer::RefCountServantBase 
+class Standard_EXPORT SALOMEDS_Study_i: public POA_SALOMEDS::Study
 {
 private:
   CORBA::ORB_ptr                 _orb;

diff --git a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx
index c9d039d576c090f7c7280cff440af4f726e13509..895d1c02763b695d5af8a67fcec84a7c51dd1329 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx
@@ -41,7 +41,7 @@
 #include "SALOMEDSImpl_UseCaseBuilder.hxx"
 
 class SALOMEDS_UseCaseBuilder_i: public virtual POA_SALOMEDS::UseCaseBuilder,
-                                public virtual PortableServer::RefCountServantBase,
+                                public virtual PortableServer::ServantBase,
                                 public virtual SALOME::GenericObj_i
 {
 private:

diff --git a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx
index 0197c77e9f4703bfc49a9829994c9df442e99464..0f4262039965a106ec5b2bfe6b4ec968592656fa 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx
@@ -35,7 +35,7 @@
 #include "SALOMEDSImpl_UseCaseIterator.hxx"
 
 class SALOMEDS_UseCaseIterator_i: public virtual POA_SALOMEDS::UseCaseIterator,
-                                 public virtual PortableServer::RefCountServantBase, 
+                                 public virtual PortableServer::ServantBase, 
                                  public virtual SALOME::GenericObj_i
 {
 private: