Restore without ContainersManager & ContainersManager

diff --git a/src/Container/Container_i.cxx b/src/Container/Container_i.cxx
index 8721982a7b6987c7a9c219ace9496f6edbf29870..7d24f68c8101e102bffdbcced4fc18d6cd47b0bb 100644 (file)
--- 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 0d2e8b9a9eb2fab6aa7d3e0b7d6c594023d90352..29e7cc949a7af454e9819525b33c36c6103a8f25 100644 (file)
--- 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