From c41e6035d050073ea10040690daae247865b8b74 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Fri, 28 Jul 2017 15:47:46 +0200 Subject: [PATCH] MED33 porting --- src/MEDLoader/MEDFileUtilities.cxx | 2 +- src/MEDLoader/MEDLoader.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MEDLoader/MEDFileUtilities.cxx b/src/MEDLoader/MEDFileUtilities.cxx index 46354964f..d309257f5 100644 --- a/src/MEDLoader/MEDFileUtilities.cxx +++ b/src/MEDLoader/MEDFileUtilities.cxx @@ -190,7 +190,7 @@ void MEDCoupling::MEDFileWritableStandAlone::write(const std::string& fileName, void MEDCoupling::MEDFileWritableStandAlone::write30(const std::string& fileName, int mode) const { med_access_mode medmod(MEDFileUtilities::TraduceWriteMode(mode)); -#if MED_NUM_MAJEUR>=3 && MED_NUM_MINEUR>=2 && MED_NUM_RELEASE>=1 +#if MED_NUM_MAJEUR>3 || ( MED_NUM_MAJEUR==3 && ( (MED_NUM_MINEUR==2 && MED_NUM_RELEASE>=1) || MED_NUM_MINEUR>=3) ) MEDFileUtilities::AutoFid fid(MEDfileVersionOpen(fileName.c_str(),medmod,3,0,0)); writeLL(fid); #else diff --git a/src/MEDLoader/MEDLoader.cxx b/src/MEDLoader/MEDLoader.cxx index e90691716..6f3ae83f2 100644 --- a/src/MEDLoader/MEDLoader.cxx +++ b/src/MEDLoader/MEDLoader.cxx @@ -308,7 +308,7 @@ std::string MEDCoupling::MEDFileVersionStr() std::string MEDCoupling::MEDFileVersionOfFileStr(const std::string& fileName) { -#if MED_NUM_MAJEUR>=3 && MED_NUM_MINEUR>=2 && MED_NUM_RELEASE>=1 +#if MED_NUM_MAJEUR>3 || ( MED_NUM_MAJEUR==3 && ( (MED_NUM_MINEUR==2 && MED_NUM_RELEASE>=1) || MED_NUM_MINEUR>=3) ) MEDFileUtilities::AutoFid fid(MEDCoupling::OpenMEDFileForRead(fileName)); const int SZ=20; const char START_EXPECTED[]="MED-"; -- 2.39.2