PR: merge from tag BR_CCRT2_mergeto_V2_1_0b1

[modules/kernel.git] / src / Container / SALOME_Container_i.hxx

diff --git a/src/Container/SALOME_Container_i.hxx b/src/Container/SALOME_Container_i.hxx
index 4e83c867ba7f08ad26ece40fd92f23f4f0bd63b6..6f309c50c8302c1d91249d0562d18a7680b9e23c 100644 (file)
--- a/src/Container/SALOME_Container_i.hxx
+++ b/src/Container/SALOME_Container_i.hxx
@@ -29,21 +29,22 @@
 #ifndef _SALOME_CONTAINER_I_HXX_
 #define _SALOME_CONTAINER_I_HXX_
 
+#include <SALOMEconfig.h>
+#include CORBA_SERVER_HEADER(SALOME_Component)
+
 #include <iostream>
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(SALOME_Component)
 #include <omnithread.h>
 #include <map>
 #include <string>
 
 class SALOME_NamingService;
 
-class Engines_Container_i: public POA_Engines::Container,
-                public PortableServer::RefCountServantBase
+class Engines_Container_i: public virtual POA_Engines::Container,
+                          public virtual PortableServer::RefCountServantBase
 {
 public:
   Engines_Container_i();
@@ -75,7 +76,7 @@ public:
   bool Kill_impl() ;
 
   char* getHostName();
-  long getPID();
+  CORBA::Long getPID();
 
 protected:
 
@@ -90,7 +91,7 @@ protected:
   std::map<std::string, void *> remove_map ;
   omni_mutex _numInstanceMutex ; // if several threads on the same object
 
-private: 
+  //private: 
 
   int   _argc ;
   char** _argv ;