From: Anthony Geay <anthony.geay@edf.fr>
Date: Thu, 2 Jan 2020 15:08:48 +0000 (+0100)
Subject: code update due to array modification
X-Git-Tag: V9_5_0a1~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5db432bcf0555f0eb644a3720f5771de5f6077d1;p=modules%2Fparavis.git

code update due to array modification
---

diff --git a/src/Plugins/MEDWriter/IO/VTKToMEDMem.cxx b/src/Plugins/MEDWriter/IO/VTKToMEDMem.cxx
index 19090de0..80a2bc03 100644
--- a/src/Plugins/MEDWriter/IO/VTKToMEDMem.cxx
+++ b/src/Plugins/MEDWriter/IO/VTKToMEDMem.cxx
@@ -111,11 +111,11 @@ Fam::Fam(const std::string& name)
 std::map<int,int> ComputeMapOfType()
 {
   std::map<int,int> ret;
-  int nbOfTypesInMC(sizeof(MEDCouplingUMesh::MEDCOUPLING2VTKTYPETRADUCER)/sizeof(int));
+  int nbOfTypesInMC(sizeof(MEDCOUPLING2VTKTYPETRADUCER)/sizeof( decltype(MEDCOUPLING2VTKTYPETRADUCER[0]) ));
   for(int i=0;i<nbOfTypesInMC;i++)
     {
-      int vtkId(MEDCouplingUMesh::MEDCOUPLING2VTKTYPETRADUCER[i]);
-      if(vtkId!=-1)
+      auto vtkId(MEDCOUPLING2VTKTYPETRADUCER[i]);
+      if(vtkId!=MEDCOUPLING2VTKTYPETRADUCER_NONE)
         ret[vtkId]=i;
     }
   return ret;
diff --git a/src/Plugins/VoroGauss/IO/vtkVoroGauss.cxx b/src/Plugins/VoroGauss/IO/vtkVoroGauss.cxx
index e251eb23..c3776572 100644
--- a/src/Plugins/VoroGauss/IO/vtkVoroGauss.cxx
+++ b/src/Plugins/VoroGauss/IO/vtkVoroGauss.cxx
@@ -93,11 +93,11 @@ vtkStandardNewMacro(vtkVoroGauss);
 std::map<int,int> ComputeMapOfType()
 {
   std::map<int,int> ret;
-  int nbOfTypesInMC(sizeof(MEDCouplingUMesh::MEDCOUPLING2VTKTYPETRADUCER)/sizeof(int));
+  int nbOfTypesInMC(sizeof(MEDCOUPLING2VTKTYPETRADUCER)/sizeof( decltype(MEDCOUPLING2VTKTYPETRADUCER[0]) ));
   for(int i=0;i<nbOfTypesInMC;i++)
     {
-      int vtkId(MEDCouplingUMesh::MEDCOUPLING2VTKTYPETRADUCER[i]);
-      if(vtkId!=-1)
+      auto vtkId(MEDCOUPLING2VTKTYPETRADUCER[i]);
+      if(vtkId!=MEDCOUPLING2VTKTYPETRADUCER_NONE)
         ret[vtkId]=i;
     }
   return ret;
@@ -106,11 +106,11 @@ std::map<int,int> ComputeMapOfType()
 std::map<int,int> ComputeRevMapOfType()
 {
   std::map<int,int> ret;
-  int nbOfTypesInMC(sizeof(MEDCouplingUMesh::MEDCOUPLING2VTKTYPETRADUCER)/sizeof(int));
+  int nbOfTypesInMC(sizeof(MEDCOUPLING2VTKTYPETRADUCER)/sizeof( decltype(MEDCOUPLING2VTKTYPETRADUCER[0]) ));
   for(int i=0;i<nbOfTypesInMC;i++)
     {
-      int vtkId(MEDCouplingUMesh::MEDCOUPLING2VTKTYPETRADUCER[i]);
-      if(vtkId!=-1)
+      auto vtkId(MEDCOUPLING2VTKTYPETRADUCER[i]);
+      if(vtkId!=MEDCOUPLING2VTKTYPETRADUCER_NONE)
         ret[i]=vtkId;
     }
   return ret;