Merge branch 'V8_4_BR'

[modules/smesh.git] / src / Tools / padder / meshjob / impl / MeshJobManager_i.hxx

diff --git a/src/Tools/padder/meshjob/impl/MeshJobManager_i.hxx b/src/Tools/padder/meshjob/impl/MeshJobManager_i.hxx
index 176d32f0c33d62219d4735bea7f41323843399d2..177c4ccfa910bf39937414d117600ef7dd93109d 100644 (file)
--- a/src/Tools/padder/meshjob/impl/MeshJobManager_i.hxx
+++ b/src/Tools/padder/meshjob/impl/MeshJobManager_i.hxx
@@ -56,6 +56,7 @@ public:
   bool           configure  (const char *configId,
                              const MESHJOB::ConfigParameter & configParameter);
   CORBA::Long    initialize (const MESHJOB::MeshJobFileList & meshJobFileList,
+                             const MESHJOB::MeshJobParameterList & meshJobParameterList,
                              const char *configId);
   bool           start      (CORBA::Long jobId);
   char*          getState   (CORBA::Long jobId);
@@ -72,7 +73,7 @@ private:
   Engines::ResourcesManager_var _resourcesManager;
   
   // This maps the config identifier to the config parameters. A
-  // config is a resource with additionnal data specifying the
+  // config is a resource with additional data specifying the
   // location of the binary program to be executed by the task
   std::map<std::string, MESHJOB::ConfigParameter> _configMap;
 
@@ -84,7 +85,8 @@ private:
   std::map<long, MESHJOB::MeshJobPaths*> _jobPathsMap;
 
   const char* _writeDataFile   (std::vector<MESHJOB::MeshJobFile> listConcreteMesh,
-                                std::vector<MESHJOB::MeshJobFile> listSteelBarMesh);
+                                std::vector<MESHJOB::MeshJobFile> listSteelBarMesh,
+                                const MESHJOB::MeshJobParameterList & meshJobParameterList);
   const char* _writeScriptFile (const char * dataFileName, const char * configId);
 
   std::vector<std::string> * _getResourceNames();