From: Konstantin LEONTEV Date: Tue, 11 Oct 2022 12:57:16 +0000 (+0300) Subject: dynamic_log_messages: Fixed compilation errors because of forgotten semicolons after... X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7b66fb096eed991daa413204ecf1c779fe76206b;p=modules%2Fsmesh.git dynamic_log_messages: Fixed compilation errors because of forgotten semicolons after log macros. --- diff --git a/src/OBJECT/SMESH_Object.cxx b/src/OBJECT/SMESH_Object.cxx index 23b782a8a..c16eb7fcc 100644 --- a/src/OBJECT/SMESH_Object.cxx +++ b/src/OBJECT/SMESH_Object.cxx @@ -855,7 +855,7 @@ void SMESH_SubMeshObj::UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunc //================================================================================= bool SMESH_SubMeshObj::Update( int theIsClear ) { - if ( MYDEBUG ) MESSAGE("SMESH_SubMeshObj::Update " << this) + if ( MYDEBUG ) MESSAGE("SMESH_SubMeshObj::Update " << this); bool changed = myMeshObj->Update( theIsClear ); buildPrs(true); return changed; diff --git a/src/SMESH/SMESH_MesherHelper.cxx b/src/SMESH/SMESH_MesherHelper.cxx index 28ef9ae55..9d67ec22d 100644 --- a/src/SMESH/SMESH_MesherHelper.cxx +++ b/src/SMESH/SMESH_MesherHelper.cxx @@ -4996,10 +4996,9 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError, } } // fix nodes on geom faces -#ifdef _DEBUG_ - int nbfaces = nbSolids; - nbfaces = faces.Extent(); /*avoid "unused varianbles": */ nbfaces++, nbfaces--; -#endif + + int nbfaces = faces.Extent(); + for ( TopTools_MapIteratorOfMapOfShape fIt( faces ); fIt.More(); fIt.Next() ) { MESSAGE("FIX FACE " << nbfaces-- << " #" << GetMeshDS()->ShapeToIndex(fIt.Key())); MSG("FIX FACE " << nbfaces-- << " #" << GetMeshDS()->ShapeToIndex(fIt.Key())); diff --git a/src/SMESHGUI/SMESHGUI_HomardBoundaryDlg.cxx b/src/SMESHGUI/SMESHGUI_HomardBoundaryDlg.cxx index 75aad174c..7d66f7ba5 100644 --- a/src/SMESHGUI/SMESHGUI_HomardBoundaryDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_HomardBoundaryDlg.cxx @@ -540,7 +540,7 @@ void SMESH_CreateBoundaryAn::SetNewName() void SMESH_CreateBoundaryAn::SetCylinder() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetCylinder") + MESSAGE("Debut de SetCylinder"); gBCylindre->setVisible(1); gBSphere->setVisible(0); gBCone->setVisible(0); @@ -555,7 +555,7 @@ void SMESH_CreateBoundaryAn::SetCylinder() void SMESH_CreateBoundaryAn::SetSphere() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetSphere") + MESSAGE("Debut de SetSphere"); gBCylindre->setVisible(0); gBSphere->setVisible(1); gBCone->setVisible(0); @@ -570,7 +570,7 @@ void SMESH_CreateBoundaryAn::SetSphere() void SMESH_CreateBoundaryAn::SetConeR() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetConeR") + MESSAGE("Debut de SetConeR"); // // Stockage et conversion des valeurs si elles ont change if ((_BoundaryAnXaxisCone != SpinBox_Cone_X1->value()) || @@ -581,7 +581,7 @@ void SMESH_CreateBoundaryAn::SetConeR() (_BoundaryAnZorigCone != SpinBox_Cone_Z2->value()) || (_BoundaryAngle != SpinBox_Cone_V1->value()) ) { - MESSAGE("Stockage et conversion") + MESSAGE("Stockage et conversion"); _BoundaryAnXaxisCone = SpinBox_Cone_X1->value() ; _BoundaryAnYaxisCone = SpinBox_Cone_Y1->value() ; _BoundaryAnZaxisCone = SpinBox_Cone_Z1->value() ; @@ -624,7 +624,7 @@ void SMESH_CreateBoundaryAn::SetConeR() void SMESH_CreateBoundaryAn::SetConeA() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetConeA") + MESSAGE("Debut de SetConeA"); // Stockage et conversion des valeurs si elles ont change if ((_BoundaryAnXcone1 != SpinBox_Cone_X1->value()) || (_BoundaryAnYcone1 != SpinBox_Cone_Y1->value()) || @@ -635,7 +635,7 @@ void SMESH_CreateBoundaryAn::SetConeA() (_BoundaryAnZcone2 != SpinBox_Cone_Z2->value()) || (_BoundaryAnRayon2 != SpinBox_Cone_V2->value()) ) { - MESSAGE("Stockage et conversion") + MESSAGE("Stockage et conversion"); _BoundaryAnXcone1 = SpinBox_Cone_X1->value() ; _BoundaryAnYcone1 = SpinBox_Cone_Y1->value() ; _BoundaryAnZcone1 = SpinBox_Cone_Z1->value() ; @@ -678,7 +678,7 @@ void SMESH_CreateBoundaryAn::SetConeA() void SMESH_CreateBoundaryAn::SetCone() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetCone") + MESSAGE("Debut de SetCone"); gBCylindre->setVisible(0); gBSphere->setVisible(0); gBCone->setVisible(1); @@ -700,7 +700,7 @@ void SMESH_CreateBoundaryAn::SetCone() void SMESH_CreateBoundaryAn::SetTore() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetTore") + MESSAGE("Debut de SetTore"); gBCylindre->setVisible(0); gBSphere->setVisible(0); gBCone->setVisible(0); @@ -718,7 +718,7 @@ void SMESH_CreateBoundaryAn::convertRayonAngle(int option) // par deux rayons ou avec un axe et un angle. // Voir sfcoi1 de HOMARD { - MESSAGE("Debut de convertRayonAngle, option = "<( buffer.get() ),length); - MESSAGE( buffer.get() ) + MESSAGE( buffer.get() ); } { SMESH_File redirectFile( redirect, /*open=*/false ); diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx index cfc7c95b5..a298530ea 100644 --- a/src/SMESH_I/SMESH_Gen_i.cxx +++ b/src/SMESH_I/SMESH_Gen_i.cxx @@ -6125,7 +6125,7 @@ char* SMESH_Gen_i::IORToLocalPersistentID( SALOMEDS::SObject_ptr /*theSObject*/, if ( myStudyContext && strcmp( IORString, "" ) != 0 ) { int anId = myStudyContext->findId( IORString ); if ( anId ) { - if(MYDEBUG) MESSAGE( "VSR " << anId ) + if(MYDEBUG) MESSAGE( "VSR " << anId ); char strId[ 20 ]; sprintf( strId, "%d", anId ); return CORBA::string_dup( strId ); diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx index 0896c5dc2..aeb0879d8 100644 --- a/src/SMESH_I/SMESH_Gen_i_1.cxx +++ b/src/SMESH_I/SMESH_Gen_i_1.cxx @@ -935,7 +935,7 @@ SMESH_Gen_i::PublishHypothesis (SMESH::SMESH_Hypothesis_ptr theHyp, SetName( aHypSO, theName, hypType.in() ); - if(MYDEBUG) MESSAGE("PublishHypothesis--END") + if(MYDEBUG) MESSAGE("PublishHypothesis--END"); return aHypSO._retn(); } @@ -1097,7 +1097,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::GetMeshOrSubmeshByShape (SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theShape) { - if(MYDEBUG) MESSAGE("GetMeshOrSubmeshByShape") + if(MYDEBUG) MESSAGE("GetMeshOrSubmeshByShape"); SALOMEDS::SObject_wrap aMeshOrSubMesh; if (theMesh->_is_nil() || ( theShape->_is_nil() && theMesh->HasShapeToMesh())) return aMeshOrSubMesh._retn(); @@ -1121,7 +1121,7 @@ SMESH_Gen_i::GetMeshOrSubmeshByShape (SMESH::SMESH_Mesh_ptr theMesh, aMeshOrSubMesh = ObjectToSObject( aSubMesh ); } } - if(MYDEBUG) MESSAGE("GetMeshOrSubmeshByShape--END") + if(MYDEBUG) MESSAGE("GetMeshOrSubmeshByShape--END"); return aMeshOrSubMesh._retn(); } @@ -1134,7 +1134,7 @@ bool SMESH_Gen_i::AddHypothesisToShape(SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theShape, SMESH::SMESH_Hypothesis_ptr theHyp) { - if(MYDEBUG) MESSAGE("AddHypothesisToShape") + if(MYDEBUG) MESSAGE("AddHypothesisToShape"); if (theMesh->_is_nil() || theHyp->_is_nil() || (theShape->_is_nil() && theMesh->HasShapeToMesh()) ) @@ -1175,7 +1175,7 @@ bool SMESH_Gen_i::AddHypothesisToShape(SMESH::SMESH_Mesh_ptr theMesh, addReference( AHR, theHyp ); - if(MYDEBUG) MESSAGE("AddHypothesisToShape--END") + if(MYDEBUG) MESSAGE("AddHypothesisToShape--END"); return true; }