Merging with BR_WPdev_For_5_0

diff --git a/src/Batch/Batch_APIInternalFailureException.hxx b/src/Batch/Batch_APIInternalFailureException.hxx
index 4e5d57457abc2619691249882142370806f739f3..cb8bb1be8075b29da2bade22b895cb073b060cb8 100644 (file)
--- a/src/Batch/Batch_APIInternalFailureException.hxx
+++ b/src/Batch/Batch_APIInternalFailureException.hxx
@@ -30,13 +30,14 @@
 #ifndef _APIINTERNALFAILUREEXCEPTION_H_
 #define _APIINTERNALFAILUREEXCEPTION_H_
 
+#include "Batch_Defines.hxx"
 
 #include "Batch_GenericException.hxx"
 #include "Batch_GenericException.hxx"
 
 namespace Batch {
 
-  class APIInternalFailureException : public GenericException
+  class BATCH_EXPORT APIInternalFailureException : public GenericException
   {
   public:
                // Constructeur

diff --git a/src/Batch/Batch_BatchManager.cxx b/src/Batch/Batch_BatchManager.cxx
index 8d3965274094a5741b96dc52dc83727e22da0c00..3fb9472509537f73d050dc3595d3fb4fa81dc479 100644 (file)
--- a/src/Batch/Batch_BatchManager.cxx
+++ b/src/Batch/Batch_BatchManager.cxx
@@ -29,7 +29,12 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <netdb.h>
+#ifdef WNT
+# include<winsock2.h>
+#else
+# include <netdb.h>
+#endif
+
 //#include "MEDMEM_STRING.hxx"
 #include "Batch_Job.hxx"
 #include "Batch_JobId.hxx"

diff --git a/src/Batch/Batch_BatchManager.hxx b/src/Batch/Batch_BatchManager.hxx
index 92a81a73255138f5cfafde8b5f8e3a21bac36a0b..c00f70c0d966abb9b6719ff21a2e53b62198e830 100644 (file)
--- a/src/Batch/Batch_BatchManager.hxx
+++ b/src/Batch/Batch_BatchManager.hxx
@@ -29,6 +29,8 @@
 #ifndef _BATCHMANAGER_H_
 #define _BATCHMANAGER_H_
 
+#include "Batch_Defines.hxx"
+
 #include <string>
 #include <map>
 #include "Batch_Job.hxx"
@@ -43,7 +45,7 @@ namespace Batch {
   class JobInfo;
   class FactBatchManager;
 
-  class BatchManager
+  class BATCH_EXPORT BatchManager
   {
   public:
     // Constructeur et destructeur

diff --git a/src/Batch/Batch_BatchManagerCatalog.hxx b/src/Batch/Batch_BatchManagerCatalog.hxx
index 81ab713ec7c303309518dcb4645118d7281deafd..d19ae24e3508efeae5f294c8292665166f06270f 100644 (file)
--- a/src/Batch/Batch_BatchManagerCatalog.hxx
+++ b/src/Batch/Batch_BatchManagerCatalog.hxx
@@ -29,6 +29,8 @@
 #ifndef _CATALOG_H_
 #define _CATALOG_H_
 
+#include "Batch_Defines.hxx"
+
 #include <string>
 #include <map>
 #include <pthread.h>
@@ -37,7 +39,7 @@ namespace Batch {
 
   class FactBatchManager;
   
-  class BatchManagerCatalog
+  class BATCH_EXPORT BatchManagerCatalog
   {
   public:
     // Constructeur

diff --git a/src/Batch/Batch_BoolType.hxx b/src/Batch/Batch_BoolType.hxx
index b367b3a028750ec4d4c84ac189c2e355c4b95c92..f25c24c5f30dc373c8021ae72cfae36b87a12bb4 100644 (file)
--- a/src/Batch/Batch_BoolType.hxx
+++ b/src/Batch/Batch_BoolType.hxx
@@ -29,12 +29,14 @@
 #ifndef _BOOLTYPE_H_
 #define _BOOLTYPE_H_
 
+#include "Batch_Defines.hxx"
+
 #include <string>
 #include "Batch_GenericType.hxx"
 
 namespace Batch {
 
-  class BoolType : public GenericType
+  class BATCH_EXPORT BoolType : public GenericType
   {
   public:
                // Constructeur

diff --git a/src/Batch/Batch_CharType.hxx b/src/Batch/Batch_CharType.hxx
index f4894f5d06545e2967024dc953185e801fcdaf53..abac3be3adf718fd150caec85efe8a5f1dde8a44 100644 (file)
--- a/src/Batch/Batch_CharType.hxx
+++ b/src/Batch/Batch_CharType.hxx
@@ -29,12 +29,14 @@
 #ifndef _CHARTYPE_H_
 #define _CHARTYPE_H_
 
+#include "Batch_Defines.hxx"
+
 #include <string>
 #include "Batch_GenericType.hxx"
 
 namespace Batch {
 
-  class CharType : public GenericType
+  class BATCH_EXPORT CharType : public GenericType
   {
   public:
                // Constructeur

diff --git a/src/Batch/Batch_ConnexionFailureException.hxx b/src/Batch/Batch_ConnexionFailureException.hxx
index 9ae672885338c2369da4adb83f0a3ec340a8fcbb..0d3a47e86df2a997dfc963f3b2aa08eecf052fef 100644 (file)
--- a/src/Batch/Batch_ConnexionFailureException.hxx
+++ b/src/Batch/Batch_ConnexionFailureException.hxx
@@ -30,12 +30,14 @@
 #ifndef _CONNEXIONFAILUREEXCEPTION_H_
 #define _CONNEXIONFAILUREEXCEPTION_H_
 
+#include "Batch_Defines.hxx"
+
 
 #include "Batch_GenericException.hxx"
 
 namespace Batch {
 
-  class ConnexionFailureException : public GenericException
+  class BATCH_EXPORT ConnexionFailureException : public GenericException
   {
   public:
                // Constructeur

diff --git a/src/Batch/Batch_Couple.hxx b/src/Batch/Batch_Couple.hxx
index 717a1c2282153c845d9c33286d966ae926f2936a..9c0deed454aa5985d1be2d912bbd5f8e26e21dfa 100644 (file)
--- a/src/Batch/Batch_Couple.hxx
+++ b/src/Batch/Batch_Couple.hxx
@@ -30,11 +30,13 @@
 #ifndef _COUPLE_H_
 #define _COUPLE_H_
 
+#include "Batch_Defines.hxx"
+
 #include <string>
 
 namespace Batch {
 
-  class Couple
+  class BATCH_EXPORT Couple
   {
   public:
     // Constructeur standard

diff --git a/src/Batch/Batch_CoupleType.hxx b/src/Batch/Batch_CoupleType.hxx
index 6d2500f1c9cb7df3dc072d9b91fb46fda11c29e2..b7d323331a8d3d0cce858939d8be651d39e5b439 100644 (file)
--- a/src/Batch/Batch_CoupleType.hxx
+++ b/src/Batch/Batch_CoupleType.hxx
@@ -30,13 +30,15 @@
 #ifndef _COUPLETYPE_H_
 #define _COUPLETYPE_H_
 
+#include "Batch_Defines.hxx"
+
 #include <string>
 #include "Batch_GenericType.hxx"
 #include "Batch_Couple.hxx"
 
 namespace Batch {
 
-  class CoupleType : public GenericType
+  class BATCH_EXPORT CoupleType : public GenericType
   {
   public:
                // Constructeur

diff --git a/src/Batch/Batch_Date.hxx b/src/Batch/Batch_Date.hxx
index 06ebd5dd17b953aa99819e51e504025d81b9d3ae..ff7d37a6f9129ebc4d2ca3dc7db90489bb64c246 100644 (file)
--- a/src/Batch/Batch_Date.hxx
+++ b/src/Batch/Batch_Date.hxx
@@ -30,11 +30,13 @@
 #ifndef _DATE_H_
 #define _DATE_H_
 
+#include "Batch_Defines.hxx"
+
 #include <string>
 
 namespace Batch {
 
-  class Date
+  class BATCH_EXPORT Date
   {
   public:
     Date(const long l=0);

diff --git a/src/Batch/Batch_DateType.hxx b/src/Batch/Batch_DateType.hxx
index 40a47702ed784ebdc8d1457e904e224c4df8e868..c7fef39a5535842d085674ac11b412948e4c0317 100644 (file)
--- a/src/Batch/Batch_DateType.hxx
+++ b/src/Batch/Batch_DateType.hxx
@@ -30,13 +30,15 @@
 #ifndef _DATETYPE_H_
 #define _DATETYPE_H_
 
+#include "Batch_Defines.hxx"
+
 #include <string>
 #include "Batch_GenericType.hxx"
 #include "Batch_Date.hxx"
 
 namespace Batch {
 
-  class DateType : public GenericType
+  class BATCH_EXPORT DateType : public GenericType
   {
   public:
                // Constructeur

diff --git a/src/Batch/Batch_Defines.hxx b/src/Batch/Batch_Defines.hxx
new file mode 100755 (executable)
index 0000000..cd66ca5
--- /dev/null
+++ b/src/Batch/Batch_Defines.hxx
@@ -0,0 +1,39 @@
+//  Copyright (C) 2003  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : Batch_Defines.hxx
+//  Author : Alexander A. BORODIN
+//  Module : SALOME
+
+#ifndef _BATCH_Defines_HXX_
+#define _BATCH_Defines_HXX_
+
+#ifdef WNT
+# ifdef BATCH_EXPORTS
+#  define BATCH_EXPORT __declspec( dllexport )
+# else
+#  define BATCH_EXPORT __declspec( dllimport )
+# endif
+#else
+# define BATCH_EXPORT
+#endif
+
+#endif

diff --git a/src/Batch/Batch_Environnement.hxx b/src/Batch/Batch_Environnement.hxx
index 2fb9c73a046556c646d3f3265ca5fbc6639f4411..e1e16f6546f3452f83d487b260e9e6e67083176b 100644 (file)
--- a/src/Batch/Batch_Environnement.hxx
+++ b/src/Batch/Batch_Environnement.hxx
@@ -30,6 +30,8 @@
 #ifndef _ENVIRONNEMENT_H_
 #define _ENVIRONNEMENT_H_
 
+#include "Batch_Defines.hxx"
+
 
 #include <string>
 #include <map>

diff --git a/src/Batch/Batch_FactBatchManager.hxx b/src/Batch/Batch_FactBatchManager.hxx
index 71d739ef0a0ab40d6f0f2c7fc9809c5d4dfad183..3a229be3004011c128b19d26c82a6139fbfe9fc5 100644 (file)
--- a/src/Batch/Batch_FactBatchManager.hxx
+++ b/src/Batch/Batch_FactBatchManager.hxx
@@ -29,6 +29,8 @@
 #ifndef _FACTBATCHMANAGER_H_
 #define _FACTBATCHMANAGER_H_
 
+#include "Batch_Defines.hxx"
+
 #include <string>
 #include <map>
 
@@ -36,7 +38,7 @@ namespace Batch {
   
   class BatchManager;
 
-  class FactBatchManager
+  class BATCH_EXPORT FactBatchManager
   {
   public:
     // Constructeur et destructeur

diff --git a/src/Batch/Batch_GenericException.hxx b/src/Batch/Batch_GenericException.hxx
index f62b6a2b900812f940121b98fabeacf191a3449e..89f79f49abdc4a40d25c1113b93e452270e9f968 100644 (file)
--- a/src/Batch/Batch_GenericException.hxx
+++ b/src/Batch/Batch_GenericException.hxx
@@ -30,12 +30,14 @@
 #ifndef _GENERICEXCEPTION_H_
 #define _GENERICEXCEPTION_H_
 
+#include "Batch_Defines.hxx"
+
 
 #include <string>
 
 namespace Batch {
 
-  class GenericException
+  class BATCH_EXPORT GenericException
   {
   public:
     const std::string type;    // la nature de l'exception

diff --git a/src/Batch/Batch_GenericType.hxx b/src/Batch/Batch_GenericType.hxx
index 674b843ad96ccd3ea9df409577278807c419b505..c5d7faf836e018077809cb8d204a55badd3980c0 100644 (file)
--- a/src/Batch/Batch_GenericType.hxx
+++ b/src/Batch/Batch_GenericType.hxx
@@ -29,13 +29,15 @@
 #ifndef _GENERICTYPE_H_
 #define _GENERICTYPE_H_
 
+#include "Batch_Defines.hxx"
+
 
 #include <iostream>
 #include <string>
 
 namespace Batch {
 
-  class GenericType
+  class BATCH_EXPORT GenericType
   {
   public:
                // Constructeur et destructeur

diff --git a/src/Batch/Batch_IntType.hxx b/src/Batch/Batch_IntType.hxx
index 82ca73a10e1913a49fb6c9473b18c12ed8f859b5..3808c9514b0a1a17f40165940f64af98600cb1a0 100644 (file)
--- a/src/Batch/Batch_IntType.hxx
+++ b/src/Batch/Batch_IntType.hxx
@@ -29,12 +29,14 @@
 #ifndef _INTTYPE_H_
 #define _INTTYPE_H_
 
+#include "Batch_Defines.hxx"
+
 #include <string>
 #include "Batch_GenericType.hxx"
 
 namespace Batch {
 
-  class IntType : public GenericType
+  class BATCH_EXPORT IntType : public GenericType
   {
   public:
                // Constructeur

diff --git a/src/Batch/Batch_InvalidArgumentException.hxx b/src/Batch/Batch_InvalidArgumentException.hxx
index 68b417ddad1b2dc547277ef009da7d79c812d39c..8ca04c190629f08b21db4f86e629372ba8958aae 100644 (file)
--- a/src/Batch/Batch_InvalidArgumentException.hxx
+++ b/src/Batch/Batch_InvalidArgumentException.hxx
@@ -31,12 +31,14 @@
 #define _INVALIDARGUMENTEXCEPTION_H_
 
 
+#include "Batch_Defines.hxx"
+
 #include "Batch_GenericException.hxx"
 #include "Batch_GenericException.hxx"
 
 namespace Batch {
 
-  class InvalidArgumentException : public GenericException
+  class BATCH_EXPORT InvalidArgumentException : public GenericException
   {
   public:
                // Constructeur

diff --git a/src/Batch/Batch_InvalidKeyException.hxx b/src/Batch/Batch_InvalidKeyException.hxx
index e07b876ee6ba748229d41c8031f7a554af6b6e39..7c9c7022a33f11e8fcc53d653030337699a686f7 100644 (file)
--- a/src/Batch/Batch_InvalidKeyException.hxx
+++ b/src/Batch/Batch_InvalidKeyException.hxx
@@ -30,13 +30,15 @@
 #ifndef _INVALIDKEYEXCEPTION_H_
 #define _INVALIDKEYEXCEPTION_H_
 
+#include "Batch_Defines.hxx"
+
 
 #include "Batch_GenericException.hxx"
 #include "Batch_GenericException.hxx"
 
 namespace Batch {
 
-  class InvalidKeyException : public GenericException
+  class BATCH_EXPORT InvalidKeyException : public GenericException
   {
   public:
                // Constructeur

diff --git a/src/Batch/Batch_Job.hxx b/src/Batch/Batch_Job.hxx
index d6ad5442b4f48a3b8efed01ed8482cea70ff497b..fabecde27ce2f61e2c88298a6ec222a4b65be0d8 100644 (file)
--- a/src/Batch/Batch_Job.hxx
+++ b/src/Batch/Batch_Job.hxx
@@ -29,13 +29,15 @@
 #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

diff --git a/src/Batch/Batch_JobId.hxx b/src/Batch/Batch_JobId.hxx
index 5046d6a310d0e132aa866ebc650d8be3051e1aca..9ae57d183f62b887b58a12de74e5223e6dcb1bf1 100644 (file)
--- a/src/Batch/Batch_JobId.hxx
+++ b/src/Batch/Batch_JobId.hxx
@@ -30,6 +30,8 @@
 #define _JOBID_H_
 
 
+#include "Batch_Defines.hxx"
+
 #include "Batch_JobInfo.hxx"
 #include "Batch_BatchManager.hxx"
 
@@ -37,7 +39,7 @@ namespace Batch {
 
   class BatchManager;
 
-  class JobId
+  class BATCH_EXPORT JobId
   {
     friend class BatchManager;
 

diff --git a/src/Batch/Batch_JobInfo.hxx b/src/Batch/Batch_JobInfo.hxx
index fbb4e35b16a7fa452af2ecd862acaca4a62c83d9..bb9c50b128b33884d9bcf72acdd5430297d78021 100644 (file)
--- a/src/Batch/Batch_JobInfo.hxx
+++ b/src/Batch/Batch_JobInfo.hxx
@@ -30,15 +30,18 @@
 #ifndef _JOBINFO_H_
 #define _JOBINFO_H_
 
-using namespace std;
+#include "Batch_Defines.hxx"
+
 #include <iostream>
 #include <string>
 #include "Batch_Parametre.hxx"
 #include "Batch_Environnement.hxx"
 
+using namespace std;
+
 namespace Batch {
 
-  class JobInfo
+  class BATCH_EXPORT JobInfo
   {
   public:
     // Constructeur standard et destructeur

diff --git a/src/Batch/Batch_ListIsFullException.hxx b/src/Batch/Batch_ListIsFullException.hxx
index 241defeb8941c102c55ddc25f5a1b62ef4c0ddba..0525ba44916cacdc0c6b72edba56dc4be70ddcaf 100644 (file)
--- a/src/Batch/Batch_ListIsFullException.hxx
+++ b/src/Batch/Batch_ListIsFullException.hxx
@@ -29,11 +29,13 @@
 #ifndef _LISTISFULLEXCEPTION_H_
 #define _LISTISFULLEXCEPTION_H_
 
+#include "Batch_Defines.hxx"
+
 #include "Batch_GenericException.hxx"
 
 namespace Batch {
 
-  class ListIsFullException : public GenericException
+  class BATCH_EXPORT ListIsFullException : public GenericException
   {
   public:
                // Constructeur

diff --git a/src/Batch/Batch_LongType.hxx b/src/Batch/Batch_LongType.hxx
index f43e8615e2f930ab3b0af3b98f971cd9fe19a0ac..3970ae0e784a723060f434b6c16cc53301d8ff39 100644 (file)
--- a/src/Batch/Batch_LongType.hxx
+++ b/src/Batch/Batch_LongType.hxx
@@ -29,12 +29,14 @@
 #ifndef _LONGTYPE_H_
 #define _LONGTYPE_H_
 
+#include "Batch_Defines.hxx"
+
 #include <string>
 #include "Batch_GenericType.hxx"
 
 namespace Batch {
 
-  class LongType : public GenericType
+  class BATCH_EXPORT LongType : public GenericType
   {
   public:
                // Constructeur

diff --git a/src/Batch/Batch_MapKey.hxx b/src/Batch/Batch_MapKey.hxx
index 93f219842620b135d97871dcbaa73a7173ca55f4..43e943f8b4576ca55c97d42236b9c51a1fcf206d 100644 (file)
--- a/src/Batch/Batch_MapKey.hxx
+++ b/src/Batch/Batch_MapKey.hxx
@@ -30,6 +30,8 @@
 #ifndef _MAPKEY_H_
 #define _MAPKEY_H_
 
+#include "Batch_Defines.hxx"
+
 
 #include <string>
 
@@ -37,7 +39,7 @@ namespace Batch {
 
   // une classe privee pour les differents types
   // ces types ne peuvent pas etre redefinis
-  class MapKey : public std::string
+  class BATCH_EXPORT MapKey : public std::string
   {
   private:
     friend class Parametre; // seule la classe Parametre peut creer des MapKey

diff --git a/src/Batch/Batch_NotYetImplementedException.hxx b/src/Batch/Batch_NotYetImplementedException.hxx
index 54f4f6205819fc743de59e8021372b7c8fd120a8..2ca75a1e1744e28325238a3fd2c6a1f4b1846a4d 100644 (file)
--- a/src/Batch/Batch_NotYetImplementedException.hxx
+++ b/src/Batch/Batch_NotYetImplementedException.hxx
@@ -30,13 +30,15 @@
 #ifndef _NOTYETIMPLEMENTEDEXCEPTION_H_
 #define _NOTYETIMPLEMENTEDEXCEPTION_H_
 
+#include "Batch_Defines.hxx"
+
 
 #include "Batch_GenericException.hxx"
 using namespace std;
 
 namespace Batch {
 
-  class NotYetImplementedException : public GenericException
+  class BATCH_EXPORT NotYetImplementedException : public GenericException
   {
   public:
                // Constructeur

diff --git a/src/Batch/Batch_Parametre.hxx b/src/Batch/Batch_Parametre.hxx
index ce88da4f931208afd5c3376fd0cda5c20fcf6b4b..a0cf0da5d1109b9e184a0c5fd0d86b94cc5ad3c7 100644 (file)
--- a/src/Batch/Batch_Parametre.hxx
+++ b/src/Batch/Batch_Parametre.hxx
@@ -29,12 +29,14 @@
 #ifndef _PARAMETRE_H_
 #define _PARAMETRE_H_
 
-using namespace std;
+#include "Batch_Defines.hxx"
+
 #include <map>
 #include <string>
 #include "Batch_InvalidKeyException.hxx"
 #include "Batch_Versatile.hxx"
 
+using namespace std;
 
 // Ces macros permettent de simplifier l'ajout de nouvelles
 // clefs dans la map Parametre
@@ -47,7 +49,7 @@ using namespace std;
 
 namespace Batch {
 
-  class Parametre : public map< string, Versatile >
+  class BATCH_EXPORT Parametre : public map< string, Versatile >
   {
   public:
     // Constructeur standard

diff --git a/src/Batch/Batch_PyVersatile.hxx b/src/Batch/Batch_PyVersatile.hxx
index e111bac43e363d9ca945ca5902785b27f3865562..8a26209ad06e60670f9c6a5712057de6428c8bc5 100644 (file)
--- a/src/Batch/Batch_PyVersatile.hxx
+++ b/src/Batch/Batch_PyVersatile.hxx
@@ -31,6 +31,8 @@
 #define _PYVERSATILE_H_
 
 
+#include "Batch_Defines.hxx"
+
 #include <Python.h>
 #include "Batch_Versatile.hxx"
 #include "Batch_TypeMismatchException.hxx"
@@ -40,7 +42,7 @@ using namespace std;
 
 namespace Batch {
 
-  class PyVersatile : public Versatile
+  class BATCH_EXPORT PyVersatile : public Versatile
   {
   public:
                // Constructeur a partir d'un objet Versatile

diff --git a/src/Batch/Batch_RunTimeException.hxx b/src/Batch/Batch_RunTimeException.hxx
index 3df53a5ca5d2fb40fbaf33a4ad38a3ce4efe4bb1..fe1e168d4adfbb27b8150b8d64d6ba68ba291a15 100644 (file)
--- a/src/Batch/Batch_RunTimeException.hxx
+++ b/src/Batch/Batch_RunTimeException.hxx
@@ -30,12 +30,14 @@
 #ifndef _RUNTIMEEXCEPTION_H_
 #define _RUNTIMEEXCEPTION_H_
 
+#include "Batch_Defines.hxx"
+
 
 #include "Batch_GenericException.hxx"
 
 namespace Batch {
 
-  class RunTimeException : public GenericException
+  class BATCH_EXPORT RunTimeException : public GenericException
   {
   public:
                // Constructeur

diff --git a/src/Batch/Batch_StringType.hxx b/src/Batch/Batch_StringType.hxx
index a72173c7e04281e53bbd3c321d8fe1c1ef6f71f5..510924e9bbaa326ca53ab1afa480a3cbd40ac47c 100644 (file)
--- a/src/Batch/Batch_StringType.hxx
+++ b/src/Batch/Batch_StringType.hxx
@@ -29,12 +29,14 @@
 #ifndef _STRINGTYPE_H_
 #define _STRINGTYPE_H_
 
+#include "Batch_Defines.hxx"
+
 #include <string>
 #include "Batch_GenericType.hxx"
 
 namespace Batch {
 
-  class StringType : public GenericType
+  class BATCH_EXPORT StringType : public GenericType
   {
   public:
                // Constructeur

diff --git a/src/Batch/Batch_TypeMismatchException.hxx b/src/Batch/Batch_TypeMismatchException.hxx
index d235ec20e068b1982f3414ee24266b92d707bc1b..b231060dcc20203fb2b618e6b761286e2997b650 100644 (file)
--- a/src/Batch/Batch_TypeMismatchException.hxx
+++ b/src/Batch/Batch_TypeMismatchException.hxx
@@ -29,12 +29,14 @@
 #ifndef _TYPEMISMATCHEXCEPTION_H_
 #define _TYPEMISMATCHEXCEPTION_H_
 
+#include "Batch_Defines.hxx"
+
 
 #include "Batch_GenericException.hxx"
 
 namespace Batch {
 
-  class TypeMismatchException : public GenericException
+  class BATCH_EXPORT TypeMismatchException : public GenericException
   {
   public:
                // Constructeur

diff --git a/src/Batch/Batch_Versatile.hxx b/src/Batch/Batch_Versatile.hxx
index cf97bbb30873caa50ecc4403bd8c0359f09e842c..c7b6f3bf6421f935b27c67840ac190a6a4f934ec 100644 (file)
--- a/src/Batch/Batch_Versatile.hxx
+++ b/src/Batch/Batch_Versatile.hxx
@@ -29,6 +29,8 @@
 #ifndef _VERSATILE_H_
 #define _VERSATILE_H_
 
+#include "Batch_Defines.hxx"
+
 #include <iostream>
 #include <list>
 #include <string>
@@ -53,7 +55,7 @@ namespace Batch {
     int maxelem; // le nombre d'elements autorises
   } TypeParam;
 
-  class Versatile : public std::list< GenericType * >
+  class BATCH_EXPORT Versatile : public std::list< GenericType * >
   {
   public:
                // Constructeur standard et destructeur

diff --git a/src/Batch/Makefile.am b/src/Batch/Makefile.am
index c6c2cbf86fc70f9cd6e54a3d756733395f98ba04..f6e53292bc3d4c0d483aae37244a399f850b234f 100644 (file)
--- a/src/Batch/Makefile.am
+++ b/src/Batch/Makefile.am
@@ -68,7 +68,8 @@ LIB_INCLUDES = \
        Batch_BatchManager_ePBS.hxx \
        Batch_FactBatchManager_ePBS.hxx \
        Batch_JobInfo_ePBS.hxx \
-       MpiImpl.hxx
+       MpiImpl.hxx \
+       Batch_Defines.hxx
 
 
 LIB_SRC = \

diff --git a/src/Batch_SWIG/libBatch_Swig.i b/src/Batch_SWIG/libBatch_Swig.i
index f5b5e791a0a11e417fdf6cfe945ec8dfab6c6744..b1fd374a8b90c9fa8405fcbd3ae62259617c29d3 100644 (file)
--- a/src/Batch_SWIG/libBatch_Swig.i
+++ b/src/Batch_SWIG/libBatch_Swig.i
@@ -48,6 +48,7 @@
 %include libBatch_Swig_exception.i
 
 %{
+#include "Batch_Defines.hxx"
 #include "Batch_Job.hxx"
 #include "Batch_JobId.hxx"
 #include "Batch_JobInfo.hxx"
@@ -58,6 +59,7 @@
 %}
 
 /* Les classes exportees en Python */
+%include Batch_Defines.hxx
 %include Batch_Job.hxx
 %include Batch_JobId.hxx
 %include Batch_JobInfo.hxx