X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FMEDFileJoint.cxx;h=a1ed652a702e9f9ff53e858b992982964589860d;hb=d5f2b9cd2ec721b8411ed143dee57234e576c369;hp=0895ba94bbe4a0915369ecf753ddfba595df0bf1;hpb=638889f1fe147dffd1e61ba40431f31a7a1a9b20;p=tools%2Fmedcoupling.git

diff --git a/src/MEDLoader/MEDFileJoint.cxx b/src/MEDLoader/MEDFileJoint.cxx
index 0895ba94b..a1ed652a7 100644
--- a/src/MEDLoader/MEDFileJoint.cxx
+++ b/src/MEDLoader/MEDFileJoint.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -18,7 +18,6 @@
 //
 
 #include "MEDFileJoint.hxx"
-#include "MEDFileUtilities.hxx"
 #include "MEDLoader.hxx"
 #include "MEDLoaderBase.hxx"
 #include "MEDFileSafeCaller.txx"
@@ -358,7 +357,7 @@ bool MEDFileJointOneStep::isEqual(const MEDFileJointOneStep *other) const
   if ( getNumberOfCorrespondences() != other->getNumberOfCorrespondences() )
     return false;
 
-  std::vector<int> found( getNumberOfCorrespondences(), false );
+  std::vector<bool> found( getNumberOfCorrespondences(), false );
   for(int i=0; i<getNumberOfCorrespondences(); i++)
     {
       int j;
@@ -411,6 +410,7 @@ std::string MEDFileJointOneStep::simpleRepr() const
     }
   return oss.str();
 }
+
 INTERP_KERNEL::NormalizedCellType MEDFileJointOneStep::convertGeometryType(med_geometry_type geotype)
 {
   INTERP_KERNEL::NormalizedCellType result=INTERP_KERNEL::NORM_ERROR;
@@ -424,6 +424,7 @@ INTERP_KERNEL::NormalizedCellType MEDFileJointOneStep::convertGeometryType(med_g
     }
   return result;
 }
+
 std::size_t MEDFileJoint::getHeapMemorySizeWithoutChildren() const
 {
   return _joint.capacity()*sizeof(MCAuto<MEDFileJointOneStep>);
@@ -546,20 +547,22 @@ bool MEDFileJoint::isEqual(const MEDFileJoint *other) const
     return false;
   if(_domain_number!=other->_domain_number)
     return false;
-  std::vector<int> found( getNumberOfSteps(), false );
-  for(int i=0; i<getNumberOfSteps(); i++)
+  int nbTS(getNumberOfSteps());
+  if(nbTS!=other->getNumberOfSteps())
+    return false;
+  std::vector<bool> found(nbTS,false);
+  for(int i=0;i<nbTS;i++)
     {
       int j;
-      for(j=0; j<getNumberOfSteps(); j++)
+      for(j=0;j<nbTS;j++)
         {
-          if ( !found[ j ] &&
-            getStepAtPos(i)->isEqual(other->getStepAtPos(j)))
+          if(!found[j] && getStepAtPos(i)->isEqual(other->getStepAtPos(j)))
             {
-              found[ j ] = true;
+              found[j]=true;
               break;
             }
         }
-      if ( j == getNumberOfSteps() )
+      if(j==nbTS)
         return false;
     }
   return true;