merge V9_dev

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

diff --git a/src/runtime/CppComponent.hxx b/src/runtime/CppComponent.hxx
index cd65241e60e1f2a92defee0e91289703f3898bc6..39ec2e66c285326ed09300adaad20299b1f79f9a 100644 (file)
--- a/src/runtime/CppComponent.hxx
+++ b/src/runtime/CppComponent.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2006-2012  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,6 +22,7 @@
 
 #include <string>
 #include "ComponentInstance.hxx"
+#include "YACSRuntimeSALOMEExport.hxx"
 
 namespace YACS 
 {
@@ -40,7 +41,7 @@ namespace YACS
     typedef void (*TerminateFunction)(void **);
     typedef void (*PingFunction) ();
         
-    class CppComponent : public ComponentInstance {
+    class YACSRUNTIMESALOME_EXPORT CppComponent : public ComponentInstance {
       public:
 
         CppComponent(const std::string & name);
@@ -55,11 +56,13 @@ namespace YACS
 
         static const char KIND[];
         virtual std::string getKind() const;
-        virtual void load();
-        virtual void unload();
-        virtual bool isLoaded();
+        virtual std::string getKindForNode() const;
+        virtual void load(Task *askingNode);
+        virtual void unload(Task *askingNode);
+        virtual bool isLoaded(Task *askingNode) const;
         virtual ServiceNode* createNode(const std::string& name);
         virtual YACS::ENGINE::ComponentInstance* clone() const;
+        virtual YACS::ENGINE::ComponentInstance* cloneAlways() const;
         
       protected: