From: azakir <abdoulbari.zakir@csgroup.eu>
Date: Sat, 12 Dec 2020 15:35:18 +0000 (+0100)
Subject: fix med_int conversion
X-Git-Tag: V9_7_0a1~18^2~51
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=af459b337cda51ec16228ab5599d8a649893daf9;p=modules%2Fsmesh.git

fix med_int conversion
---

diff --git a/src/SMESHGUI/MG_ADAPT.cxx b/src/SMESHGUI/MG_ADAPT.cxx
index 641c0f0c2..a89924ed7 100644
--- a/src/SMESHGUI/MG_ADAPT.cxx
+++ b/src/SMESHGUI/MG_ADAPT.cxx
@@ -429,8 +429,8 @@ bool MgAdapt::setAll()
     }
 
     setSizeMapFile(mapfile);
-    int rank;
-    int tmst;
+    med_int rank;
+    med_int tmst;
     if (data->myUseNoTimeStep)
     {
         rank = MED_NO_IT;
@@ -446,7 +446,7 @@ bool MgAdapt::setAll()
         rank = data->myRank;
         tmst  = data->myTimeStep;
     }
-    setRankTimeStep(tmst, rank);
+    setRankTimeStep((int)tmst, (int)rank);
 
     /* Advanced options */
     setWorkingDir(data->myWorkingDir);
@@ -1233,13 +1233,13 @@ MgAdapt::Status MgAdapt::addMessage(const std::string& msg,
 
 
 // =======================================================================
-void MgAdapt::getTimeStepInfos(std::string aFile, int& numdt, int& numit)
+void MgAdapt::getTimeStepInfos(std::string aFile, med_int& numdt, med_int& numit)
 // =======================================================================
 {
 // Il faut voir si plusieurs maillages
 
 
-    med_err erreur = 0 ;
+    herr_t erreur = 0 ;
     med_idt medIdt ;
 
 
@@ -1278,7 +1278,7 @@ void MgAdapt::getTimeStepInfos(std::string aFile, int& numdt, int& numit)
     }
 
     med_float dt;
-    int tmp_numdt, tmp_numit;
+    med_int tmp_numdt, tmp_numit;
 
     med_int step = data->myUseLastTimeStep ? nbofcstp : data->myTimeStep+1;
     //~myPrint("step ", step);
diff --git a/src/SMESHGUI/MG_ADAPT.hxx b/src/SMESHGUI/MG_ADAPT.hxx
index f81dd03c5..1854c931c 100644
--- a/src/SMESHGUI/MG_ADAPT.hxx
+++ b/src/SMESHGUI/MG_ADAPT.hxx
@@ -318,7 +318,7 @@ private :
     void storeGroupsAndFams(MEDCoupling::MEDFileMesh* fileMesh);
     void restoreGroupsAndFams(MEDCoupling::MEDFileMesh* fileMesh) const;
     void convertMeshFile(std::string& meshFormatIn, std::vector< std::string>& solFieldFileNames) const ;
-    void getTimeStepInfos(std::string aFile, int& numdt, int& numit);
+    void getTimeStepInfos(std::string aFile, med_int& numdt, med_int& numit);
     Status addMessage(const std::string& msg, const bool isFatal = false);
     med_idt openMedFile(const std::string aFile) ;
     bool isFileExist(std::string& fName) const;