From b52638d4f41d46bb0226b12bcbfa9b0279e7fc6c Mon Sep 17 00:00:00 2001 From: rahuel Date: Mon, 8 Nov 2004 11:51:14 +0000 Subject: [PATCH] Restore without ContainersManager & ContainersManager --- src/Container/Container_i.cxx | 19 +------------------ src/Container/SALOME_Container_i.hxx | 7 +------ 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/src/Container/Container_i.cxx b/src/Container/Container_i.cxx index 8721982a7..7d24f68c8 100644 --- a/src/Container/Container_i.cxx +++ b/src/Container/Container_i.cxx @@ -140,16 +140,6 @@ Engines_Container_i::~Engines_Container_i() MESSAGE("Container_i::~Container_i()"); } -void Engines_Container_i::destroy() { - MESSAGE( "Container_i::destroy : " << _containerName.c_str() ) ; - _NS->Destroy_Name( _containerName.c_str() ) ; - _poa->deactivate_object( *_id ) ; - CORBA::release( _poa ) ; - delete( _id ) ; - this->_remove_ref(); - MESSAGE( "Container_i::destroyed" ) ; -} - char* Engines_Container_i::name() { return CORBA::string_dup(_containerName.c_str()) ; @@ -167,12 +157,6 @@ void Engines_Container_i::ping() MESSAGE("Engines_Container_i::ping() pid "<< getpid()); } -Engines::ContainerType Engines_Container_i::type() -{ - MESSAGE( "Engines_Container_i::type() "<< Engines::CppContainer ); - return Engines::CppContainer ; -} - // Kill current container bool Engines_Container_i::Kill_impl() { MESSAGE("Engines_Container_i::Kill() pid "<< getpid() << " containerName " @@ -183,8 +167,7 @@ bool Engines_Container_i::Kill_impl() { } // Launch a new container from the current container -Engines::Container_ptr Engines_Container_i::start_impl( const char* ContainerName , - const Engines::ContainerType aContainerType ) { +Engines::Container_ptr Engines_Container_i::start_impl( const char* ContainerName ) { MESSAGE("start_impl argc " << _argc << " ContainerName " << ContainerName << hex << this << dec) ; _numInstanceMutex.lock() ; // lock on the instance number diff --git a/src/Container/SALOME_Container_i.hxx b/src/Container/SALOME_Container_i.hxx index 0d2e8b9a9..29e7cc949 100644 --- a/src/Container/SALOME_Container_i.hxx +++ b/src/Container/SALOME_Container_i.hxx @@ -56,10 +56,8 @@ public: bool activ = true); virtual ~Engines_Container_i(); - void destroy() ; - // Launch a new container from the current container - Engines::Container_ptr start_impl( const char* ContainerName , const Engines::ContainerType ); + Engines::Container_ptr start_impl( const char* ContainerName ); // Load component in current container Engines::Component_ptr load_impl( const char* nameToRegister , @@ -72,7 +70,6 @@ public: char* name(); char* machineName(); void ping(); - Engines::ContainerType type(); // Kill current container bool Kill_impl() ; @@ -100,7 +97,5 @@ protected: }; -std::ostream & operator<< (std::ostream &,const Engines::ContainerType &); - #endif -- 2.39.2