X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FMEDWrapper%2FMED_Wrapper.cxx;fp=src%2FMEDWrapper%2FMED_Wrapper.cxx;h=dc1e3f53fb6915ac0188a0fcd9c216324180d150;hp=85a8d9f35d1214b01962c4f13f3c2735f404f654;hb=29fa6f3696b1a72716948c6e97a260cda288f6d0;hpb=bcb3b6e5cdffc1ebd118d37aa7b2099613bff297 diff --git a/src/MEDWrapper/MED_Wrapper.cxx b/src/MEDWrapper/MED_Wrapper.cxx index 85a8d9f35..dc1e3f53f 100644 --- a/src/MEDWrapper/MED_Wrapper.cxx +++ b/src/MEDWrapper/MED_Wrapper.cxx @@ -78,13 +78,15 @@ namespace MED TFile(const TFile&); public: - TFile(const std::string& theFileName, TInt theMinor=-1): + TFile(const std::string& theFileName, TInt theMajor=-1, TInt theMinor=-1): myCount(0), myFid(0), myFileName(theFileName), + myMajor(theMajor), myMinor(theMinor) { - if ((myMinor < 0) || (myMinor > MED_MINOR_NUM)) myMinor = MED_MINOR_NUM; + if ((myMajor < 0) || (myMajor > MED_MAJOR_NUM)) myMajor = MED_MAJOR_NUM; + if ((myMinor < 0) || (myMajor == MED_MAJOR_NUM && myMinor > MED_MINOR_NUM)) myMinor = MED_MINOR_NUM; } ~TFile() @@ -98,7 +100,7 @@ namespace MED { if (myCount++ == 0) { const char* aFileName = myFileName.c_str(); - myFid = MEDfileVersionOpen(aFileName,med_access_mode(theMode), MED_MAJOR_NUM, myMinor, MED_RELEASE_NUM); + myFid = MEDfileVersionOpen(aFileName,med_access_mode(theMode), myMajor, myMinor, MED_RELEASE_NUM); } if (theErr) *theErr = TErr(myFid); @@ -125,6 +127,7 @@ namespace MED TInt myCount; TIdt myFid; std::string myFileName; + TInt myMajor; TInt myMinor; }; @@ -187,8 +190,9 @@ namespace MED //--------------------------------------------------------------- TWrapper - ::TWrapper(const std::string& theFileName, bool write, TInt theMinor): - myFile(new TFile(theFileName, theMinor)), + ::TWrapper(const std::string& theFileName, bool write, TInt theMajor, TInt theMinor): + myFile(new TFile(theFileName, theMajor, theMinor)), + myMajor(theMajor), myMinor(theMinor) { TErr aRet;