[EDF17047] : Py3 porting of PyParse_Tuple

[modules/yacs.git] / src / runtime / SalomePythonComponent.cxx

diff --git a/src/runtime/SalomePythonComponent.cxx b/src/runtime/SalomePythonComponent.cxx
index 7e79c081ea02f68b8bec697b5952af3116ef99d8..cc6fb4e0845e4090e1a235da18fc9ef3b8e1ce8c 100644 (file)
--- a/src/runtime/SalomePythonComponent.cxx
+++ b/src/runtime/SalomePythonComponent.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2016  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -44,11 +44,11 @@ SalomePythonComponent::~SalomePythonComponent()
 {
 }
 
-void SalomePythonComponent::load()
+void SalomePythonComponent::load(Task *askingNode)
 {
   if(_container)
     {
-      _container->start(this);
+      _container->start(askingNode);
       return;
     }
   //This component has no specified container : use default container policy
@@ -56,16 +56,16 @@ void SalomePythonComponent::load()
   //throw Exception("SalomePythonComponent::load : no container specified !!! To be implemented in executor to allocate default a Container in case of presenceOfDefaultContainer.");
 }
 
-void SalomePythonComponent::unload()
+void SalomePythonComponent::unload(Task *askingNode)
 {
 }
 
-bool SalomePythonComponent::isLoaded()
+bool SalomePythonComponent::isLoaded(Task *askingNode) const
 {
   if(!_container)
     return false;
   else
-    return _container->isAlreadyStarted(this);
+    return _container->isAlreadyStarted(askingNode);
 }
 
 std::string SalomePythonComponent::getKind() const
@@ -85,6 +85,11 @@ ComponentInstance* SalomePythonComponent::clone() const
     return new SalomePythonComponent(*this);
 }
 
+ComponentInstance *SalomePythonComponent::cloneAlways() const
+{
+  return new SalomePythonComponent(*this);
+}
+
 ServiceNode *SalomePythonComponent::createNode(const std::string &name)
 {
   ServiceNode* node=new SalomePythonNode(name);
@@ -99,10 +104,10 @@ std::string SalomePythonComponent::getFileRepr() const
   return stream.str();
 }
 
-std::string SalomePythonComponent::getStringValueToExportInInterp() const
+std::string SalomePythonComponent::getStringValueToExportInInterp(const Task *askingNode) const
 {
   if(!_container)
     return "localhost/FactoryServer";
   else
-    return _container->getPlacementId(this);
+    return _container->getPlacementId(askingNode);
 }