Issue 0020194: EDF 977 ALL: Get rid of warnings PACKAGE_VERSION already defined

[modules/kernel.git] / src / Batch / Batch_Job.hxx

diff --git a/src/Batch/Batch_Job.hxx b/src/Batch/Batch_Job.hxx
index 66fdf04947b1fc9c9b72ca521853868c7a6291df..264fb8e82e619a2ab1be65f7788736261fd40346 100644 (file)
--- a/src/Batch/Batch_Job.hxx
+++ b/src/Batch/Batch_Job.hxx
@@ -1,3 +1,24 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 /*
  * Job.hxx : 
  *
@@ -10,32 +31,34 @@
 #ifndef _JOB_H_
 #define _JOB_H_
 
+#include "Batch_Defines.hxx"
+
 
 #include "Batch_Parametre.hxx"
 #include "Batch_Environnement.hxx"
 
 namespace Batch {
 
-  class Job
+  class BATCH_EXPORT Job
   {
   public:
     // Constructeurs et destructeur
     Job();
-    Job(Parametre param);
-    Job(Environnement env);
-    Job(Parametre param, Environnement env);
+    Job(Batch::Parametre param);
+    Job(Batch::Environnement env);
+    Job(Batch::Parametre param, Batch::Environnement env);
     virtual ~Job() {}
     
     // Operateur pour l'affichage sur un stream
     friend std::ostream & operator <<(std::ostream & os, const Job & job);
 
     // Accesseurs
-    Parametre getParametre() const;
-    void setParametre(const Parametre &);
+    Batch::Parametre getParametre() const;
+    void setParametre(const Batch::Parametre &);
     
     // Accesseurs
-    Environnement getEnvironnement() const;
-    void setEnvironnement(const Environnement &);
+    Batch::Environnement getEnvironnement() const;
+    void setEnvironnement(const Batch::Environnement &);
     
     // Methodes pour l'interfacage avec Python (SWIG)
     // TODO : supprimer ces methodes et transferer leur definitions dans SWIG
@@ -43,8 +66,8 @@ namespace Batch {
     std::string  __repr__() const { return __str__(); }; // SWIG : affichage en Python
 
   protected:
-    Parametre _param; // table des parametres batch du job
-    Environnement _env; // table des variables d'environnement
+    Batch::Parametre _param; // table des parametres batch du job
+    Batch::Environnement _env; // table des variables d'environnement
 
   private: