From f426913a16765d4c7269862591f1a8c4a8713876 Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 22 Apr 2021 15:44:30 +0300 Subject: [PATCH] #24166 [OCC][Windows] MEDCoupling can't be built under Windows after 34b392fa96 commit: fix compilation on Linux with MPI --- src/ICoCo/ICoCoField.hxx | 4 ---- src/ICoCo/ICoCoMEDDoubleField.hxx | 4 ---- src/ICoCo/ICoCoMEDIntField.hxx | 4 ---- src/ParaMEDMEM_Swig/ParaMEDMEM.i | 1 + 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/ICoCo/ICoCoField.hxx b/src/ICoCo/ICoCoField.hxx index d87994618..ea4959e2e 100644 --- a/src/ICoCo/ICoCoField.hxx +++ b/src/ICoCo/ICoCoField.hxx @@ -34,11 +34,7 @@ namespace ICoCo * * The Field class holds the name of the field. */ -#ifndef SWIG class MEDCOUPLINGICOCO_EXPORT Field -#else - class Field -#endif { public: /*! @brief Set the name of the field. diff --git a/src/ICoCo/ICoCoMEDDoubleField.hxx b/src/ICoCo/ICoCoMEDDoubleField.hxx index a2de0a5f1..ef68ea9a0 100644 --- a/src/ICoCo/ICoCoMEDDoubleField.hxx +++ b/src/ICoCo/ICoCoMEDDoubleField.hxx @@ -45,11 +45,7 @@ namespace ICoCo * @sa the MEDCoupling documentation, notably the reference counter mechanism used to manage the lifecycle of * MEDCoupling objects. */ -#ifndef SWIG class MEDCOUPLINGICOCO_EXPORT MEDDoubleField : public ICoCo::Field -#else - class MEDDoubleField : public ICoCo::Field -#endif { public: /*! Builds an empty field (internal MEDCoupling object not set). diff --git a/src/ICoCo/ICoCoMEDIntField.hxx b/src/ICoCo/ICoCoMEDIntField.hxx index f9ef27ab3..1adfbc859 100644 --- a/src/ICoCo/ICoCoMEDIntField.hxx +++ b/src/ICoCo/ICoCoMEDIntField.hxx @@ -44,11 +44,7 @@ namespace ICoCo * @sa the MEDCoupling documentation, notably the reference counter mechanism used to manage the lifecycle of * MEDCoupling objects. */ -#ifndef SWIG class MEDCOUPLINGICOCO_EXPORT MEDIntField : public ICoCo::Field -#else - class MEDIntField : public ICoCo::Field -#endif { public: /*! Builds an empty field (internal MEDCoupling object not set). diff --git a/src/ParaMEDMEM_Swig/ParaMEDMEM.i b/src/ParaMEDMEM_Swig/ParaMEDMEM.i index 40d0bd8db..5aee5c600 100644 --- a/src/ParaMEDMEM_Swig/ParaMEDMEM.i +++ b/src/ParaMEDMEM_Swig/ParaMEDMEM.i @@ -23,6 +23,7 @@ #define MEDCOUPLING_EXPORT #define INTERPKERNEL_EXPORT +#define MEDCOUPLINGICOCO_EXPORT %include "MEDCouplingCommon.i" %include "ICoCoMEDField.i" -- 2.39.2