From 3f9f6313b77ba56acd99a1f8f8e7431aafac8c69 Mon Sep 17 00:00:00 2001 From: abd Date: Wed, 11 Apr 2007 04:47:51 +0000 Subject: [PATCH] Integrate missing files --- src/Communication/SALOME_Comm_i.hxx | 4 ++-- src/Communication/SALOME_Matrix_i.hxx | 4 ++-- src/Container/SALOME_Component_i.hxx | 2 +- src/Container/SALOME_ContainerManager.hxx | 3 +-- src/Container/SALOME_Container_i.hxx | 2 +- src/Container/SALOME_FileRef_i.hxx | 2 +- src/Container/SALOME_FileTransfer_i.hxx | 2 +- src/Logger/SALOME_Logger_Server.hxx | 3 +-- src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx | 3 +-- src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx | 3 +-- src/NamingService/Test/NamingServiceTest.hxx | 4 ++-- src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_Callback_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_SAttribute_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_SObject_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx | 3 +-- src/SALOMEDS/SALOMEDS_StudyManager_i.hxx | 4 ++-- src/SALOMEDS/SALOMEDS_Study_i.hxx | 3 +-- src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx | 2 +- 23 files changed, 27 insertions(+), 33 deletions(-) diff --git a/src/Communication/SALOME_Comm_i.hxx b/src/Communication/SALOME_Comm_i.hxx index 4bcde2ef4..6664fc4c0 100644 --- 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 3b3d33af7..26e8729a8 100644 --- 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 5107cb59e..3bd3f85d0 100644 --- 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 d74988084..a84a99f98 100644 --- 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 181c4f84e..fe32eba83 100644 --- 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 61b3f52f2..3e32964a5 100644 --- 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 c0ecb18e6..f35a5582d 100644 --- 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 9f7a16a83..5b1f13f93 100644 --- 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 c6ce34ea5..c7b580a17 100644 --- 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 92976b7e3..5dad3bacf 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx @@ -40,8 +40,7 @@ #include #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 d41ddcae3..b471a9449 100644 --- 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 950181786..26455a9f3 100644 --- a/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx +++ b/src/SALOMEDS/SALOMEDS_BasicAttribute_i.hxx @@ -35,7 +35,7 @@ #include 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 ffc6e6db2..d6f755437 100644 --- 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 7092d89f3..d2af3944d 100644 --- a/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx +++ b/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx @@ -37,7 +37,7 @@ #include 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 32176a41a..093ed285a 100644 --- 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 4652d95ee..0b1106ff0 100644 --- a/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx +++ b/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx @@ -43,7 +43,7 @@ #include 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 dba9faad6..3335a1a28 100644 --- 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 2a492fc22..b836a2bee 100644 --- 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 ae6d0e5c5..40d5fd18d 100644 --- a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx +++ b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx @@ -37,8 +37,7 @@ // Cascade header #include -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 31c486f7b..9ef1801bb 100644 --- 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 cabc9c648..0b2a44960 100644 --- 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 c9d039d57..895d1c027 100644 --- 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 0197c77e9..0f4262039 100644 --- 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: -- 2.39.2