From: vsr <vsr@opencascade.com>
Date: Tue, 19 Jul 2011 12:02:05 +0000 (+0000)
Subject: Merge from V6_3_BR 19/07/2011
X-Git-Tag: V6_main_FINAL~1000
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e113c181cd222f9b4b488091a5dd541acda4d27d;p=tools%2Fmedcoupling.git

Merge from V6_3_BR 19/07/2011
---

diff --git a/src/INTERP_KERNEL/Interpolation2DCurve.hxx b/src/INTERP_KERNEL/Interpolation2DCurve.hxx
index 0077fa3b8..8a3f09b2a 100644
--- a/src/INTERP_KERNEL/Interpolation2DCurve.hxx
+++ b/src/INTERP_KERNEL/Interpolation2DCurve.hxx
@@ -25,7 +25,7 @@
 
 namespace INTERP_KERNEL
 {
-  class Interpolation2DCurve : public InterpolationCurve<Interpolation2DCurve>
+  class INTERPKERNEL_EXPORT Interpolation2DCurve : public InterpolationCurve<Interpolation2DCurve>
   {
   public:
     Interpolation2DCurve();
diff --git a/src/INTERP_KERNEL/Interpolation3D.cxx b/src/INTERP_KERNEL/Interpolation3D.cxx
index 70e249140..d5c9f6c86 100644
--- a/src/INTERP_KERNEL/Interpolation3D.cxx
+++ b/src/INTERP_KERNEL/Interpolation3D.cxx
@@ -18,6 +18,7 @@
 //
 
 #include "Interpolation3D.hxx"
+#include "Interpolation3D.txx"
 
 namespace INTERP_KERNEL
 {
diff --git a/src/MEDCoupling/MEDCouplingDefinitionTime.hxx b/src/MEDCoupling/MEDCouplingDefinitionTime.hxx
index dbe8e2320..deb7b3a77 100644
--- a/src/MEDCoupling/MEDCouplingDefinitionTime.hxx
+++ b/src/MEDCoupling/MEDCouplingDefinitionTime.hxx
@@ -32,7 +32,7 @@ namespace ParaMEDMEM
 {
   class MEDCouplingFieldDouble;
 
-  class MEDCouplingDefinitionTimeSlice : public RefCountObject
+  class MEDCOUPLING_EXPORT MEDCouplingDefinitionTimeSlice : public RefCountObject
   {
   public:
     static MEDCouplingDefinitionTimeSlice *New(const MEDCouplingFieldDouble *f, int meshId, const std::vector<int>& arrId, int fieldId) throw(INTERP_KERNEL::Exception);
@@ -136,7 +136,7 @@ namespace ParaMEDMEM
     double _end;
   };
 
-  class MEDCouplingDefinitionTime
+  class MEDCOUPLING_EXPORT MEDCouplingDefinitionTime
   {
   public:
     MEDCouplingDefinitionTime();
diff --git a/src/MEDCoupling/MEDCouplingFieldOverTime.hxx b/src/MEDCoupling/MEDCouplingFieldOverTime.hxx
index e017b58ef..10711d637 100644
--- a/src/MEDCoupling/MEDCouplingFieldOverTime.hxx
+++ b/src/MEDCoupling/MEDCouplingFieldOverTime.hxx
@@ -28,7 +28,7 @@
 
 namespace ParaMEDMEM
 {
-  class MEDCouplingFieldOverTime : public MEDCouplingMultiFields
+  class MEDCOUPLING_EXPORT MEDCouplingFieldOverTime : public MEDCouplingMultiFields
   {
   public:
     static MEDCouplingFieldOverTime *New(const std::vector<MEDCouplingFieldDouble *>& fs) throw(INTERP_KERNEL::Exception);
diff --git a/src/MEDCoupling/MEDCouplingFieldTemplate.hxx b/src/MEDCoupling/MEDCouplingFieldTemplate.hxx
index 43f76e860..3b7fba334 100644
--- a/src/MEDCoupling/MEDCouplingFieldTemplate.hxx
+++ b/src/MEDCoupling/MEDCouplingFieldTemplate.hxx
@@ -26,7 +26,7 @@ namespace ParaMEDMEM
 {
   class MEDCouplingFieldDouble;
 
-  class MEDCouplingFieldTemplate : public MEDCouplingField
+  class MEDCOUPLING_EXPORT MEDCouplingFieldTemplate : public MEDCouplingField
   {
   public:
     static MEDCouplingFieldTemplate *New(const MEDCouplingFieldDouble *f) throw(INTERP_KERNEL::Exception);
diff --git a/src/MEDCoupling/MEDCouplingMemArray.hxx b/src/MEDCoupling/MEDCouplingMemArray.hxx
index a0e9eb0cc..9dc9b89eb 100644
--- a/src/MEDCoupling/MEDCouplingMemArray.hxx
+++ b/src/MEDCoupling/MEDCouplingMemArray.hxx
@@ -236,10 +236,10 @@ namespace ParaMEDMEM
     //! nothing to do here because this class does not aggregate any TimeLabel instance.
     MEDCOUPLING_EXPORT void updateTime() const { }
   public:
-    void getTinySerializationIntInformation(std::vector<int>& tinyInfo) const;
-    void getTinySerializationStrInformation(std::vector<std::string>& tinyInfo) const;
-    bool resizeForUnserialization(const std::vector<int>& tinyInfoI);
-    void finishUnserialization(const std::vector<int>& tinyInfoI, const std::vector<std::string>& tinyInfoS);
+    MEDCOUPLING_EXPORT void getTinySerializationIntInformation(std::vector<int>& tinyInfo) const;
+    MEDCOUPLING_EXPORT void getTinySerializationStrInformation(std::vector<std::string>& tinyInfo) const;
+    MEDCOUPLING_EXPORT bool resizeForUnserialization(const std::vector<int>& tinyInfoI);
+    MEDCOUPLING_EXPORT void finishUnserialization(const std::vector<int>& tinyInfoI, const std::vector<std::string>& tinyInfoS);
   private:
     DataArrayDouble() { }
   private:
@@ -360,10 +360,10 @@ namespace ParaMEDMEM
   public:
     MEDCOUPLING_EXPORT static int *CheckAndPreparePermutation(const int *start, const int *end);
   public:
-    void getTinySerializationIntInformation(std::vector<int>& tinyInfo) const;
-    void getTinySerializationStrInformation(std::vector<std::string>& tinyInfo) const;
-    bool resizeForUnserialization(const std::vector<int>& tinyInfoI);
-    void finishUnserialization(const std::vector<int>& tinyInfoI, const std::vector<std::string>& tinyInfoS);
+    MEDCOUPLING_EXPORT void getTinySerializationIntInformation(std::vector<int>& tinyInfo) const;
+    MEDCOUPLING_EXPORT void getTinySerializationStrInformation(std::vector<std::string>& tinyInfo) const;
+    MEDCOUPLING_EXPORT bool resizeForUnserialization(const std::vector<int>& tinyInfoI);
+    MEDCOUPLING_EXPORT void finishUnserialization(const std::vector<int>& tinyInfoI, const std::vector<std::string>& tinyInfoS);
   private:
     DataArrayInt() { }
   private:
diff --git a/src/MEDCoupling/MEDCouplingMultiFields.hxx b/src/MEDCoupling/MEDCouplingMultiFields.hxx
index 39d944754..ea1613d02 100644
--- a/src/MEDCoupling/MEDCouplingMultiFields.hxx
+++ b/src/MEDCoupling/MEDCouplingMultiFields.hxx
@@ -35,7 +35,7 @@ namespace ParaMEDMEM
   class MEDCouplingFieldDouble;
   class MEDCouplingFieldTemplate;
 
-  class MEDCouplingMultiFields : public RefCountObject, public TimeLabel
+  class MEDCOUPLING_EXPORT MEDCouplingMultiFields : public RefCountObject, public TimeLabel
   {
   public:
     static MEDCouplingMultiFields *New(const std::vector<MEDCouplingFieldDouble *>& fs) throw(INTERP_KERNEL::Exception);
diff --git a/src/MEDLoader/MEDFileData.hxx b/src/MEDLoader/MEDFileData.hxx
index 2fb00eaf2..b7f9c0dda 100644
--- a/src/MEDLoader/MEDFileData.hxx
+++ b/src/MEDLoader/MEDFileData.hxx
@@ -29,7 +29,7 @@ namespace ParaMEDMEM
   /*!
    * User class.
    */
-  class MEDFileData : public RefCountObject, public MEDFileWritable
+  class MEDLOADER_EXPORT MEDFileData : public RefCountObject, public MEDFileWritable
   {
   public:
     static MEDFileData *New(const char *fileName) throw(INTERP_KERNEL::Exception);
diff --git a/src/MEDLoader/MEDFileField.hxx b/src/MEDLoader/MEDFileField.hxx
index 4d0356e1b..e385aea27 100644
--- a/src/MEDLoader/MEDFileField.hxx
+++ b/src/MEDLoader/MEDFileField.hxx
@@ -244,7 +244,7 @@ namespace ParaMEDMEM
     std::string _file_name;
   };
 
-  class MEDFieldFieldGlobsReal
+  class MEDLOADER_EXPORT MEDFieldFieldGlobsReal
   {
   public:
     MEDFieldFieldGlobsReal(const char *fname);
@@ -273,7 +273,7 @@ namespace ParaMEDMEM
     MEDCouplingAutoRefCountObjectPtr< MEDFieldFieldGlobs > _globals;
   };
 
-  class MEDFileField1TSWithoutDAS : public RefCountObject, public MEDFileWritable
+  class MEDLOADER_EXPORT MEDFileField1TSWithoutDAS : public RefCountObject, public MEDFileWritable
   {
   public:
     void copyTinyInfoFrom(const MEDCouplingFieldDouble *field) throw(INTERP_KERNEL::Exception);
@@ -327,7 +327,7 @@ namespace ParaMEDMEM
   /*!
    * User class.
    */
-  class MEDFileField1TS : public MEDFileField1TSWithoutDAS, public MEDFieldFieldGlobsReal
+  class MEDLOADER_EXPORT MEDFileField1TS : public MEDFileField1TSWithoutDAS, public MEDFieldFieldGlobsReal
   {
   public:
     static MEDFileField1TS *New(const char *fileName, const char *fieldName, int iteration, int order) throw(INTERP_KERNEL::Exception);
@@ -348,7 +348,7 @@ namespace ParaMEDMEM
     MEDFileField1TS();
   };
   
-  class MEDFileFieldMultiTSWithoutDAS : public RefCountObject, public MEDFileWritable
+  class MEDLOADER_EXPORT MEDFileFieldMultiTSWithoutDAS : public RefCountObject, public MEDFileWritable
   {
   public:
     static MEDFileFieldMultiTSWithoutDAS *New(med_idt fid, const char *fieldName, int id, const std::vector<std::string>& infos, int nbOfStep) throw(INTERP_KERNEL::Exception);
@@ -381,7 +381,7 @@ namespace ParaMEDMEM
   /*!
    * User class.
    */
-  class MEDFileFieldMultiTS : public MEDFileFieldMultiTSWithoutDAS, public MEDFieldFieldGlobsReal
+  class MEDLOADER_EXPORT MEDFileFieldMultiTS : public MEDFileFieldMultiTSWithoutDAS, public MEDFieldFieldGlobsReal
   {
   public:
     static MEDFileFieldMultiTS *New();
@@ -408,7 +408,7 @@ namespace ParaMEDMEM
   /*!
    * Use class.
    */
-  class MEDFileFields : public RefCountObject, public MEDFieldFieldGlobsReal, public MEDFileWritable
+  class MEDLOADER_EXPORT MEDFileFields : public RefCountObject, public MEDFieldFieldGlobsReal, public MEDFileWritable
   {
   public:
     static MEDFileFields *New();
diff --git a/src/MEDLoader/MEDFileMesh.hxx b/src/MEDLoader/MEDFileMesh.hxx
index 773c82b97..32f4edfc6 100644
--- a/src/MEDLoader/MEDFileMesh.hxx
+++ b/src/MEDLoader/MEDFileMesh.hxx
@@ -20,6 +20,7 @@
 #ifndef __MEDFILEMESH_HXX__
 #define __MEDFILEMESH_HXX__
 
+#include "MEDLoaderDefines.hxx"
 #include "MEDFileMeshLL.hxx"
 #include "MEDFileUtilities.hxx"
 
@@ -27,7 +28,7 @@
 
 namespace ParaMEDMEM
 {
-  class MEDFileMesh : public RefCountObject, public MEDFileWritable
+  class MEDLOADER_EXPORT MEDFileMesh : public RefCountObject, public MEDFileWritable
   {
   public:
     static MEDFileMesh *New(const char *fileName) throw(INTERP_KERNEL::Exception);
@@ -122,7 +123,7 @@ namespace ParaMEDMEM
     static const char DFT_FAM_NAME[];
   };
 
-  class MEDFileUMesh : public MEDFileMesh
+  class MEDLOADER_EXPORT MEDFileUMesh : public MEDFileMesh
   {
     friend class MEDFileMesh;
   public:
@@ -195,7 +196,7 @@ namespace ParaMEDMEM
     mutable MEDCouplingAutoRefCountObjectPtr<DataArrayInt> _rev_num_coords;
   };
 
-  class MEDFileCMesh : public MEDFileMesh
+  class MEDLOADER_EXPORT MEDFileCMesh : public MEDFileMesh
   {
     friend class MEDFileMesh;
   public:
@@ -233,7 +234,7 @@ namespace ParaMEDMEM
     mutable MEDCouplingAutoRefCountObjectPtr<DataArrayInt> _rev_num_cells;
   };
 
-  class MEDFileMeshMultiTS : public RefCountObject, public MEDFileWritable
+  class MEDLOADER_EXPORT MEDFileMeshMultiTS : public RefCountObject, public MEDFileWritable
   {
   public:
     static MEDFileMeshMultiTS *New();
@@ -252,7 +253,7 @@ namespace ParaMEDMEM
     std::vector< MEDCouplingAutoRefCountObjectPtr<MEDFileMesh> > _mesh_one_ts;
   };
 
-  class MEDFileMeshes : public RefCountObject, public MEDFileWritable
+  class MEDLOADER_EXPORT MEDFileMeshes : public RefCountObject, public MEDFileWritable
   {
   public:
     static MEDFileMeshes *New();
diff --git a/src/MEDLoader/MEDFileUtilities.hxx b/src/MEDLoader/MEDFileUtilities.hxx
index 53f0453d9..435fa833a 100644
--- a/src/MEDLoader/MEDFileUtilities.hxx
+++ b/src/MEDLoader/MEDFileUtilities.hxx
@@ -21,6 +21,7 @@
 #define __MEDFILEUTILITIES_HXX__
 
 #include "InterpKernelException.hxx"
+#include "MEDLoaderDefines.hxx"
 
 extern "C"
 {
@@ -46,7 +47,7 @@ namespace MEDFileUtilities
   
 namespace ParaMEDMEM
 {
-  class MEDFileWritable
+  class MEDLOADER_EXPORT MEDFileWritable
   {
   public:
     MEDFileWritable();