Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/med.git] / src / MEDMEM / MEDMEM_MedMedDriver.hxx

diff --git a/src/MEDMEM/MEDMEM_MedMedDriver.hxx b/src/MEDMEM/MEDMEM_MedMedDriver.hxx
index 859941536fa9fd70eeebced770d2843081c75e00..007d1fa91d266cf44dfdbea76d1b4451f47d68ec 100644 (file)
--- a/src/MEDMEM/MEDMEM_MedMedDriver.hxx
+++ b/src/MEDMEM/MEDMEM_MedMedDriver.hxx
@@ -20,6 +20,8 @@
 #ifndef MED_MED_DRIVER_HXX
 #define MED_MED_DRIVER_HXX
 
+#include "MEDMEM.hxx"
+
 #include <string>
 #include "MEDMEM_STRING.hxx"
 #include "MEDMEM_Utilities.hxx"
@@ -41,7 +43,7 @@ class MESH;
 class FIELD_;
 class MED;
 
-class MED_MED_DRIVER : public GENDRIVER
+class MEDMEM_EXPORT MED_MED_DRIVER : public GENDRIVER
 {
 protected:
   
@@ -97,7 +99,7 @@ protected:
 
 */
 
-class IMED_MED_RDONLY_DRIVER : public virtual MED_MED_DRIVER
+class MEDMEM_EXPORT IMED_MED_RDONLY_DRIVER : public virtual MED_MED_DRIVER
 {
 public :
   /*!
@@ -126,6 +128,10 @@ public :
     Return a MEDEXCEPTION : it is the read-only driver.
   */
   void writeFrom      ( void ) const throw (MEDEXCEPTION) ;
+
+protected:
+  // PAL14192: to allow painless repeated readFileStruct() calls
+  bool _fileStructIsRead;
 };
 
 /*!
@@ -136,7 +142,7 @@ public :
 
 */
 
-class IMED_MED_WRONLY_DRIVER : public virtual MED_MED_DRIVER
+class MEDMEM_EXPORT IMED_MED_WRONLY_DRIVER : public virtual MED_MED_DRIVER
 {
 
 public :
@@ -177,7 +183,7 @@ public :
 
 */
 
-class IMED_MED_RDWR_DRIVER : public virtual IMED_MED_RDONLY_DRIVER,
+class MEDMEM_EXPORT IMED_MED_RDWR_DRIVER : public virtual IMED_MED_RDONLY_DRIVER,
                             public virtual IMED_MED_WRONLY_DRIVER
 {
 
@@ -202,7 +208,7 @@ public :
 
 };
 
-class MED_MED_RDONLY_DRIVER : public virtual IMED_MED_RDONLY_DRIVER
+class MEDMEM_EXPORT MED_MED_RDONLY_DRIVER : public virtual IMED_MED_RDONLY_DRIVER
 {
 public :
   MED_MED_RDONLY_DRIVER();
@@ -219,7 +225,7 @@ private:
   GENDRIVER * copy ( void ) const;
 };
 
-class MED_MED_WRONLY_DRIVER : public virtual IMED_MED_WRONLY_DRIVER
+class MEDMEM_EXPORT MED_MED_WRONLY_DRIVER : public virtual IMED_MED_WRONLY_DRIVER
 {
 
 public :
@@ -237,7 +243,7 @@ private:
   GENDRIVER * copy ( void ) const;
 };
 
-class MED_MED_RDWR_DRIVER : public IMED_MED_RDWR_DRIVER
+class MEDMEM_EXPORT MED_MED_RDWR_DRIVER : public IMED_MED_RDWR_DRIVER
 {
 
 public :