Remove warnings

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

diff --git a/src/Batch/Batch_Parametre.hxx b/src/Batch/Batch_Parametre.hxx
index e4ed4d8897c44fa5bc8f971e27b899b8ad235ba6..c572a73bfea7fc2464b81eed761312f39a6ca0d0 100644 (file)
--- a/src/Batch/Batch_Parametre.hxx
+++ b/src/Batch/Batch_Parametre.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
+//
 /*
  * Parametre.hxx : 
  *
@@ -10,50 +31,54 @@
 #ifndef _PARAMETRE_H_
 #define _PARAMETRE_H_
 
+#include "Batch_Defines.hxx"
+
 #include <map>
 #include <string>
 #include "Batch_InvalidKeyException.hxx"
 #include "Batch_Versatile.hxx"
 
-
 // Ces macros permettent de simplifier l'ajout de nouvelles
 // clefs dans la map Parametre
 // TODO : remplacer ce mecanisme statique par la lecture
 // TODO : d'une descrption dans un fichier exterieur (genre XML)
 
-#define def_extern_MapKey(mk) extern const std::string & mk;
-#define def_static_MapKey(mk) const std::string Batch::Parametre::mk(#mk); \
-                              const std::string & mk = Batch::Parametre::mk;
+#define def_extern_MapKey(mk) extern BATCH_EXPORT const std::string & mk;
+#define def_static_MapKey(mk) const std::string Batch::Parametre::mk(#mk);     \
+  const std::string & mk = Batch::Parametre::mk;
 
 namespace Batch {
 
-  class Parametre : public std::map< std::string, Versatile >
+  class BATCH_EXPORT Parametre : public std::map< std::string, Versatile >
   {
   public:
-               // Constructeur standard
+    // Constructeur standard
     Parametre();
 
-               // Constructeur par recopie
-    Parametre::Parametre(const Parametre & PM);
+    // Constructeur par recopie
+    Parametre(const Parametre & PM);
 
-               // Operateur de recherche dans la map
+    // Operateur de recherche dans la map
     Versatile & operator [] (const std::string &);
     const Versatile & operator [] (const std::string &) const;
 
-               // Operateur d'affectation
+    // Operateur d'affectation
     Parametre & operator =(const Parametre & PM);
 
-               // Declarations statique des clefs de la map
-               // TODO : supprimer les declarations statiques des clefs de la map
+    // Declarations statique des clefs de la map
+    // TODO : supprimer les declarations statiques des clefs de la map
     static const std::string ACCOUNT;
+    static const std::string ARGUMENTS;
     static const std::string CHECKPOINT;
     static const std::string CKPTINTERVAL;
     static const std::string CREATIONTIME;
     static const std::string EGROUP;
     static const std::string ELIGIBLETIME;
+    static const std::string ENDTIME;
     static const std::string EUSER;
     static const std::string EXECUTABLE;
     static const std::string EXECUTIONHOST;
+    static const std::string EXITCODE;
     static const std::string HOLD;
     static const std::string ID;
     static const std::string INFILE;
@@ -64,12 +89,13 @@ namespace Batch {
     static const std::string MAXWALLTIME;
     static const std::string MODIFICATIONTIME;
     static const std::string NAME;
+    static const std::string NBPROC;
     static const std::string OUTFILE;
     static const std::string PID;
     static const std::string QUEUE;
     static const std::string QUEUEDTIME;
     static const std::string SERVER;
-    static const std::string STARTDATE;
+    static const std::string STARTTIME;
     static const std::string STATE;
     static const std::string TEXT;
     static const std::string TMPDIR;
@@ -78,6 +104,8 @@ namespace Batch {
     static const std::string USEDRAMSIZE;
     static const std::string USEDWALLTIME;
     static const std::string USER;
+    static const std::string WORKDIR;
+    static const std::string HOMEDIR;
 
   protected:
     std::map< std::string, TypeParam > TypeMap; // map interne servant a controler le type de la valeur associee a chaque clef
@@ -89,14 +117,17 @@ namespace Batch {
 }
 
 def_extern_MapKey(ACCOUNT);
+def_extern_MapKey(ARGUMENTS);
 def_extern_MapKey(CHECKPOINT);
 def_extern_MapKey(CKPTINTERVAL);
 def_extern_MapKey(CREATIONTIME);
 def_extern_MapKey(EGROUP);
 def_extern_MapKey(ELIGIBLETIME);
+def_extern_MapKey(ENDTIME);
 def_extern_MapKey(EUSER);
 def_extern_MapKey(EXECUTABLE);
 def_extern_MapKey(EXECUTIONHOST);
+def_extern_MapKey(EXITCODE);
 def_extern_MapKey(HOLD);
 def_extern_MapKey(ID);
 def_extern_MapKey(INFILE);
@@ -107,12 +138,13 @@ def_extern_MapKey(MAXRAMSIZE);
 def_extern_MapKey(MAXWALLTIME);
 def_extern_MapKey(MODIFICATIONTIME);
 def_extern_MapKey(NAME);
+def_extern_MapKey(NBPROC);
 def_extern_MapKey(OUTFILE);
 def_extern_MapKey(PID);
 def_extern_MapKey(QUEUE);
 def_extern_MapKey(QUEUEDTIME);
 def_extern_MapKey(SERVER);
-def_extern_MapKey(STARTDATE);
+def_extern_MapKey(STARTTIME);
 def_extern_MapKey(STATE);
 def_extern_MapKey(TEXT);
 def_extern_MapKey(TMPDIR);
@@ -121,5 +153,7 @@ def_extern_MapKey(USEDDISKSIZE);
 def_extern_MapKey(USEDRAMSIZE);
 def_extern_MapKey(USEDWALLTIME);
 def_extern_MapKey(USER);
+def_extern_MapKey(WORKDIR);
+def_extern_MapKey(HOMEDIR);
 
 #endif