From 46edadc69050f0f627a9ff6987c96d98df0e2cff Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 6 Sep 2018 11:12:12 +0300 Subject: [PATCH] Attempt 2 of windows porting. --- src/MEDCoupling/MEDCouplingFieldDouble.hxx | 14 +++++++------- src/RENUMBER_Swig/MEDRenumberCommon.i | 5 +++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/MEDCoupling/MEDCouplingFieldDouble.hxx b/src/MEDCoupling/MEDCouplingFieldDouble.hxx index 757df6ae7..051d4a5e2 100644 --- a/src/MEDCoupling/MEDCouplingFieldDouble.hxx +++ b/src/MEDCoupling/MEDCouplingFieldDouble.hxx @@ -154,13 +154,13 @@ namespace MEDCoupling protected: ~MEDCouplingFieldDouble() { } private: - MEDCouplingFieldDouble(TypeOfField type, TypeOfTimeDiscretization td); - MEDCouplingFieldDouble(const MEDCouplingFieldTemplate& ft, TypeOfTimeDiscretization td); - MEDCouplingFieldDouble(const MEDCouplingFieldDouble& other, bool deepCpy); - MEDCouplingFieldDouble(NatureOfField n, MEDCouplingTimeDiscretization *td, MEDCouplingFieldDiscretization *type); - MCAuto voronoizeGen(const Voronizer *vor, double eps) const; - MEDCouplingTimeDiscretization *timeDiscr(); - const MEDCouplingTimeDiscretization *timeDiscr() const; + MEDCOUPLING_EXPORT MEDCouplingFieldDouble(TypeOfField type, TypeOfTimeDiscretization td); + MEDCOUPLING_EXPORT MEDCouplingFieldDouble(const MEDCouplingFieldTemplate& ft, TypeOfTimeDiscretization td); + MEDCOUPLING_EXPORT MEDCouplingFieldDouble(const MEDCouplingFieldDouble& other, bool deepCpy); + MEDCOUPLING_EXPORT MEDCouplingFieldDouble(NatureOfField n, MEDCouplingTimeDiscretization *td, MEDCouplingFieldDiscretization *type); + MEDCOUPLING_EXPORT MCAuto voronoizeGen(const Voronizer *vor, double eps) const; + MEDCOUPLING_EXPORT MEDCouplingTimeDiscretization *timeDiscr(); + MEDCOUPLING_EXPORT const MEDCouplingTimeDiscretization *timeDiscr() const; }; } diff --git a/src/RENUMBER_Swig/MEDRenumberCommon.i b/src/RENUMBER_Swig/MEDRenumberCommon.i index a88e4fb6f..cfc8354ec 100644 --- a/src/RENUMBER_Swig/MEDRenumberCommon.i +++ b/src/RENUMBER_Swig/MEDRenumberCommon.i @@ -25,6 +25,11 @@ #ifdef WIN32 #define MEDCOUPLING_WIN32_SWIG #endif +%} + +%include "MEDCouplingCommon.i" + +%{ #include "MEDCouplingMemArray.txx" #include "MCAuto.hxx" #include "MEDCouplingDataArrayTypemaps.i" -- 2.39.2