#17956 [CEA 17925] COMPERR_OCC_EXCEPTION

diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx
index 01e5f628a3b5dfd4f171bca534f09289ca5cf650..0673fc64edc86cca16612d6475a9109515e1987f 100644 (file)
--- a/src/SMESH/SMESH_MeshEditor.cxx
+++ b/src/SMESH/SMESH_MeshEditor.cxx
@@ -7478,6 +7478,8 @@ void SMESH_MeshEditor::FindEqualElements( TIDSortedElemSet &        theElements,
   while ( elemIt->more() )
   {
     const SMDS_MeshElement* curElem = elemIt->next();
+    if ( curElem->IsNull() )
+      continue;
     ComparableElement      compElem = curElem;
     // check uniqueness
     const ComparableElement& elemInSet = mapOfElements.Added( compElem );

diff --git a/src/SMESHUtils/SMESH_FillHole.cxx b/src/SMESHUtils/SMESH_FillHole.cxx
index ff4a8584c5ee6af8e584655c20e6d2d48787d9e5..0d09f0d8e4b507968d788d5eaa1b25e10f3fc325 100644 (file)
--- a/src/SMESHUtils/SMESH_FillHole.cxx
+++ b/src/SMESHUtils/SMESH_FillHole.cxx
@@ -35,7 +35,7 @@
 #include <Utils_SALOME_Exception.hxx>
 
 #include <boost/intrusive/circular_list_algorithms.hpp>
-#include <boost/container/flat_map.hpp>
+//#include <boost/container/flat_map.hpp>
 
 #include <Bnd_B3d.hxx>