Revert "Merge branch 'yan/parallel_mesh2'"

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

diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
index 3ab3d55a3fca87a2713bf64c7bf2489b73a6a69e..a504888d0949f335ece66b0afbe5dd49d7b0fc1b 100644 (file)
--- a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -123,17 +123,19 @@ namespace {
 
   bool storeShapeForDebug(const TopoDS_Shape& shape)
   {
+    bool toShow;
 #ifdef _DEBUG_
     const char* type[] ={"COMPOUND","COMPSOLID","SOLID","SHELL","FACE","WIRE","EDGE","VERTEX"};
     BRepTools::Write( shape, SMESH_Comment("/tmp/") << type[shape.ShapeType()] << "_"
                       << shape.TShape().operator->() << ".brep");
-    if ( !theMeshDS[0] ) {
-      show_shape( TopoDS_Shape(), "avoid warning: show_shape() defined but not used");
-      show_list( "avoid warning: show_list() defined but not used", list< TopoDS_Edge >() );
-    }
+    toShow = !theMeshDS[0]; // no show
 #else
-    (void)shape; // unused in release mode
+    toShow = theMeshDS[0]; // no show
 #endif
+    if ( toShow ) {
+      show_shape( shape, "avoid warning: show_shape() defined but not used");
+      show_list( "avoid warning: show_list() defined but not used", list< TopoDS_Edge >() );
+    }
     return false;
   }
   
@@ -540,8 +542,10 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
   //       b) find association of a couple of vertices and recall self.
   //
 
+#ifdef _DEBUG_
   theMeshDS[0] = theMesh1->GetMeshDS(); // debug
   theMeshDS[1] = theMesh2->GetMeshDS();
+#endif
 
   // =================================================================================
   // 1) Is it the case of associating a group member -> another group? (PAL16202, 16203)
@@ -2869,7 +2873,7 @@ namespace StdMeshers_ProjectionUtils
     const SMDS_MeshNode *srcNode, *tgtNode;
 
     // un-mark internal src nodes in order iterate them using _delaunay
-    int nbSrcNodes = 0;
+    smIdType nbSrcNodes = 0;
     SMDS_NodeIteratorPtr nIt = _srcSubMesh->GetSubMeshDS()->GetNodes();
     if ( !nIt || !nIt->more() ) return true;
     if ( moveAll )