fight warnings, c++17. Fix minor warnings. Buils SMESH finished

[modules/smesh.git] / src / StdMeshers / StdMeshers_CompositeHexa_3D.cxx

diff --git a/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx b/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx
index b0f10f8d0d174ec23abf4ef64c1425175b8cb0c5..f537fb5f21f7df97bd7d31172d279475eb0ea834 100644 (file)
--- a/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx
+++ b/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2019  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -283,8 +283,8 @@ StdMeshers_CompositeHexa_3D::StdMeshers_CompositeHexa_3D(int hypId, SMESH_Gen* g
  */
 //================================================================================
 
-bool StdMeshers_CompositeHexa_3D::CheckHypothesis(SMESH_Mesh&         aMesh,
-                                                  const TopoDS_Shape& aShape,
+bool StdMeshers_CompositeHexa_3D::CheckHypothesis(SMESH_Mesh&         /*aMesh*/,
+                                                  const TopoDS_Shape& /*aShape*/,
                                                   Hypothesis_Status&  aStatus)
 {
   aStatus = HYP_OK;
@@ -420,9 +420,9 @@ namespace
                          const TopTools_MapOfShape& cornerVV,
                          TopTools_MapOfShape&       internEE)
   {
-    TopTools_IndexedMapOfShape subEE;
+    TopTools_IndexedMapOfShape subEE, subFF;
     TopExp::MapShapes( shape, TopAbs_EDGE, subEE );
-    //TopExp::MapShapes( shape, TopAbs_FACE, subFF );
+    TopExp::MapShapes( shape, TopAbs_FACE, subFF );
 
     TopoDS_Vertex VV[2];
     TopTools_MapOfShape subChecked, ridgeEE;
@@ -460,6 +460,8 @@ namespace
             {
               if ( !SMESH_MesherHelper::IsSubShape( ridgeE, *F ))
                 continue;
+              if ( !subFF.Contains( *F ))
+                continue;
               if ( isContinuousMesh( ridgeE, TopoDS::Edge( *E ), TopoDS::Face( *F ), mesh ))
               {
                 nextRidgeE = *E;