merge from branch DEV tag mergeto_trunk_04apr08

[modules/yacs.git] / src / runtime / SalomeContainer.hxx

diff --git a/src/runtime/SalomeContainer.hxx b/src/runtime/SalomeContainer.hxx
index 275243016b7842ff71035e70a345d5878b58a043..901c5b061b5d8c830ece2d6ed648e1e1ee2aadab 100644 (file)
--- a/src/runtime/SalomeContainer.hxx
+++ b/src/runtime/SalomeContainer.hxx
@@ -3,8 +3,11 @@
 
 #include "Container.hxx"
 #include "Mutex.hxx"
+#include <string>
+#include <vector>
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOME_Component)
+#include CORBA_CLIENT_HEADER(SALOME_ContainerManager)
 
 namespace YACS
 {
@@ -27,12 +30,18 @@ namespace YACS
       Container *clone() const;
       std::string getPlacementId() const;
       void checkCapabilityToDealWith(const ComponentInstance *inst) const throw (Exception);
+      virtual void setProperty(const std::string& name, const std::string& value);
+      bool isAPaCOContainer() const;
+      virtual void addComponentName(std::string name);
     protected:
       virtual ~SalomeContainer();
     protected:
       //! thread safety in Salome ???
       YACS::BASES::Mutex _mutex;
       Engines::Container_var _trueCont;
+      std::vector<std::string> _componentNames;
+    public:
+      Engines::MachineParameters _params;
     };
   }
 }