From f3ff4bd008fad84046fe7e72a1cfb7bd20301b11 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 19 Jul 2011 07:03:23 +0000 Subject: [PATCH] Merge from V6_3_1_WIN (Win32 porting) 19/07/2011 --- src/INTERP_KERNEL/Interpolation2DCurve.hxx | 2 +- src/INTERP_KERNEL/Interpolation3D.cxx | 1 + src/MEDCoupling/MEDCouplingDefinitionTime.hxx | 4 ++-- src/MEDCoupling/MEDCouplingFieldOverTime.hxx | 2 +- src/MEDCoupling/MEDCouplingFieldTemplate.hxx | 2 +- src/MEDCoupling/MEDCouplingMemArray.hxx | 16 ++++++++-------- src/MEDCoupling/MEDCouplingMultiFields.hxx | 2 +- src/MEDLoader/MEDFileData.hxx | 2 +- src/MEDLoader/MEDFileField.hxx | 12 ++++++------ src/MEDLoader/MEDFileMesh.hxx | 11 ++++++----- src/MEDLoader/MEDFileUtilities.hxx | 3 ++- 11 files changed, 30 insertions(+), 27 deletions(-) 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 + class INTERPKERNEL_EXPORT Interpolation2DCurve : public InterpolationCurve { 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& 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& 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 64890dcec..463f60d99 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& tinyInfo) const; - void getTinySerializationStrInformation(std::vector& tinyInfo) const; - bool resizeForUnserialization(const std::vector& tinyInfoI); - void finishUnserialization(const std::vector& tinyInfoI, const std::vector& tinyInfoS); + MEDCOUPLING_EXPORT void getTinySerializationIntInformation(std::vector& tinyInfo) const; + MEDCOUPLING_EXPORT void getTinySerializationStrInformation(std::vector& tinyInfo) const; + MEDCOUPLING_EXPORT bool resizeForUnserialization(const std::vector& tinyInfoI); + MEDCOUPLING_EXPORT void finishUnserialization(const std::vector& tinyInfoI, const std::vector& 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& tinyInfo) const; - void getTinySerializationStrInformation(std::vector& tinyInfo) const; - bool resizeForUnserialization(const std::vector& tinyInfoI); - void finishUnserialization(const std::vector& tinyInfoI, const std::vector& tinyInfoS); + MEDCOUPLING_EXPORT void getTinySerializationIntInformation(std::vector& tinyInfo) const; + MEDCOUPLING_EXPORT void getTinySerializationStrInformation(std::vector& tinyInfo) const; + MEDCOUPLING_EXPORT bool resizeForUnserialization(const std::vector& tinyInfoI); + MEDCOUPLING_EXPORT void finishUnserialization(const std::vector& tinyInfoI, const std::vector& 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& 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 17939b7c9..102823f6d 100644 --- a/src/MEDLoader/MEDFileField.hxx +++ b/src/MEDLoader/MEDFileField.hxx @@ -243,7 +243,7 @@ namespace ParaMEDMEM std::string _file_name; }; - class MEDFieldFieldGlobsReal + class MEDLOADER_EXPORT MEDFieldFieldGlobsReal { public: MEDFieldFieldGlobsReal(const char *fname); @@ -272,7 +272,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); @@ -326,7 +326,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); @@ -347,7 +347,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& infos, int nbOfStep) throw(INTERP_KERNEL::Exception); @@ -380,7 +380,7 @@ namespace ParaMEDMEM /*! * User class. */ - class MEDFileFieldMultiTS : public MEDFileFieldMultiTSWithoutDAS, public MEDFieldFieldGlobsReal + class MEDLOADER_EXPORT MEDFileFieldMultiTS : public MEDFileFieldMultiTSWithoutDAS, public MEDFieldFieldGlobsReal { public: static MEDFileFieldMultiTS *New(); @@ -407,7 +407,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 5429133cc..030aaef01 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); @@ -120,7 +121,7 @@ namespace ParaMEDMEM static const char DFT_FAM_NAME[]; }; - class MEDFileUMesh : public MEDFileMesh + class MEDLOADER_EXPORT MEDFileUMesh : public MEDFileMesh { friend class MEDFileMesh; public: @@ -191,7 +192,7 @@ namespace ParaMEDMEM mutable MEDCouplingAutoRefCountObjectPtr _rev_num_coords; }; - class MEDFileCMesh : public MEDFileMesh + class MEDLOADER_EXPORT MEDFileCMesh : public MEDFileMesh { friend class MEDFileMesh; public: @@ -227,7 +228,7 @@ namespace ParaMEDMEM mutable MEDCouplingAutoRefCountObjectPtr _rev_num_cells; }; - class MEDFileMeshMultiTS : public RefCountObject, public MEDFileWritable + class MEDLOADER_EXPORT MEDFileMeshMultiTS : public RefCountObject, public MEDFileWritable { public: static MEDFileMeshMultiTS *New(); @@ -246,7 +247,7 @@ namespace ParaMEDMEM std::vector< MEDCouplingAutoRefCountObjectPtr > _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(); -- 2.39.2