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 ac5921b5a3f02cd2704730ace7881a2cbeec817c..177c4ccfa910bf39937414d117600ef7dd93109d 100644 (file)
--- a/src/Tools/padder/meshjob/impl/MeshJobManager_i.hxx
+++ b/src/Tools/padder/meshjob/impl/MeshJobManager_i.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2011-2013  EDF R&D
+// Copyright (C) 2011-2016  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
@@ -33,8 +33,19 @@
 #include <string>
 #include <map>
 
-class MeshJobManager_i: public virtual POA_MESHJOB::MeshJobManager,
-                        public Engines_Component_i
+#ifdef WIN32
+ #if defined MESHJOBMANAGERENGINE_EXPORTS || defined MeshJobManagerEngine_EXPORTS
+  #define MESHJOBMANAGERENGINE_EXPORT __declspec( dllexport )
+ #else
+  #define MESHJOBMANAGERENGINE_EXPORT __declspec( dllimport )
+ #endif
+#else
+ #define MESHJOBMANAGERENGINE_EXPORT
+#endif
+
+
+class MESHJOBMANAGERENGINE_EXPORT MeshJobManager_i: public virtual POA_MESHJOB::MeshJobManager,
+                                                    public Engines_Component_i
 {
 public:
   MeshJobManager_i(CORBA::ORB_ptr orb, PortableServer::POA_ptr poa,
@@ -43,9 +54,10 @@ public:
   ~MeshJobManager_i();
 
   bool           configure  (const char *configId,
-                            const MESHJOB::ConfigParameter & configParameter);
-  CORBA::Long    initialize (const MESHJOB::MeshJobParameterList & meshJobParameterList,
-                            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);
   MESHJOB::MeshJobResults * finalize(CORBA::Long jobId);
@@ -61,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;
 
@@ -72,8 +84,9 @@ private:
   std::map<long, long> _jobDateTimeMap;
   std::map<long, MESHJOB::MeshJobPaths*> _jobPathsMap;
 
-  const char* _writeDataFile   (std::vector<MESHJOB::MeshJobParameter> listConcreteMesh,
-                                std::vector<MESHJOB::MeshJobParameter> listSteelBarMesh);
+  const char* _writeDataFile   (std::vector<MESHJOB::MeshJobFile> listConcreteMesh,
+                                std::vector<MESHJOB::MeshJobFile> listSteelBarMesh,
+                                const MESHJOB::MeshJobParameterList & meshJobParameterList);
   const char* _writeScriptFile (const char * dataFileName, const char * configId);
 
   std::vector<std::string> * _getResourceNames();