From 45c96eb616c2cff2c9cb18df5d9a14b7ad768700 Mon Sep 17 00:00:00 2001 From: Konstantin LEONTEV Date: Sat, 8 Oct 2022 18:59:46 +0300 Subject: [PATCH] dynamic_log_messages: Fixed compilation errors because of forgotten semicolons after log macros. --- .../SALOME_ModuleCatalog_Acomponent_impl.cxx | 4 ++-- .../SALOME_ModuleCatalog_Client.cxx | 2 +- .../SALOME_ModuleCatalog_Handler.cxx | 4 ++-- src/NamingService/SALOME_NamingService.cxx | 2 +- src/Registry/RegistryService.cxx | 4 ++-- src/Registry/SALOME_Registry_Server.cxx | 8 ++++---- src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx | 8 ++++---- src/SALOMEDS/SALOMEDS_Client.cxx | 16 ++++++++-------- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx index 877fa5458..98fb903ab 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx @@ -177,8 +177,8 @@ SALOME_ModuleCatalog_AcomponentImpl::GetServiceList(const char* interfacename) for (unsigned int ind1 = 0; ind1 < _length_services ; ind1++) { _list[ind1] = CORBA::string_dup(I.interfaceservicelist[ind1].ServiceName); - if(MYDEBUG) MESSAGE("The interface " << interfacename << " of the component " - << _Component.name << " contains " << _list[ind1] << " as a service") + MESSAGE("The interface " << interfacename << " of the component " + << _Component.name << " contains " << _list[ind1] << " as a service"); } } } diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Client.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Client.cxx index f1c6c04a2..eb76d3d16 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Client.cxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Client.cxx @@ -62,7 +62,7 @@ int main(int argc,char **argv) SALOME_ModuleCatalog::ModuleCatalog_var Catalogue = SALOME_ModuleCatalog::ModuleCatalog::_narrow(objVarN); - MESSAGE("Distant catalog of component found") + MESSAGE("Distant catalog of component found"); // Get component list SALOME_ModuleCatalog::ListOfComponents_var list_composants diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx index 5eb66b8b5..e3303f9e7 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx @@ -117,8 +117,8 @@ SALOME_ModuleCatalog_Handler::SALOME_ModuleCatalog_Handler(ParserPathPrefixes& p //---------------------------------------------------------------------- SALOME_ModuleCatalog_Handler::~SALOME_ModuleCatalog_Handler() { - if(MYDEBUG) BEGIN_OF("~SALOME_ModuleCatalog_Handler()") - if(MYDEBUG) END_OF("~SALOME_ModuleCatalog_Handler()") + BEGIN_OF("~SALOME_ModuleCatalog_Handler()"); + END_OF("~SALOME_ModuleCatalog_Handler()"); } diff --git a/src/NamingService/SALOME_NamingService.cxx b/src/NamingService/SALOME_NamingService.cxx index 1505f2e3f..93408ff3f 100644 --- a/src/NamingService/SALOME_NamingService.cxx +++ b/src/NamingService/SALOME_NamingService.cxx @@ -787,7 +787,7 @@ char *SALOME_NamingService::Current_Directory() path += splitPath[k]; } - SCRUTE(path) + SCRUTE(path); _current_context = ref_context ; return strdup(path.c_str()); diff --git a/src/Registry/RegistryService.cxx b/src/Registry/RegistryService.cxx index c1d9762e3..e0426758b 100644 --- a/src/Registry/RegistryService.cxx +++ b/src/Registry/RegistryService.cxx @@ -109,7 +109,7 @@ void RegistryService::remove( CORBA::ULong id) ASSERT(_SessionName) ; ASSERT(strlen(_SessionName)>0) ; - ASSERT(_reg.find(id)!=_reg.end()) + ASSERT(_reg.find(id)!=_reg.end()); _reg[id]->_status=TERMINATED; _reg[id]->_ts_end = (long)time(NULL) ; //!< TODO: conversation from time_t to long @@ -131,7 +131,7 @@ void RegistryService::hello( CORBA::ULong id ) ASSERT(_SessionName) ; ASSERT(strlen(_SessionName)>0) ; - ASSERT(_reg.find(id)!=_reg.end()) + ASSERT(_reg.find(id)!=_reg.end()); _reg[id]->_ts_hello = (long)time(NULL) ; //!< TODO: conversation from time_t to long END_OF("RegistryService::hello") ; diff --git a/src/Registry/SALOME_Registry_Server.cxx b/src/Registry/SALOME_Registry_Server.cxx index d4aaac8df..bc46f9a9c 100644 --- a/src/Registry/SALOME_Registry_Server.cxx +++ b/src/Registry/SALOME_Registry_Server.cxx @@ -54,9 +54,9 @@ int main( int argc , char **argv ) SetArgcArgv( argc, argv ); CORBA::ORB_var orb = KERNEL::GetRefToORB(); // LocalTraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); - BEGIN_OF( argv[0] ) - INFOS_COMPILATION - SCRUTE(argc) + BEGIN_OF( argv[0] ); + INFOS_COMPILATION; + SCRUTE(argc); if( argc<3 ) { MESSAGE("you must provide the Salome session name when you call SALOME_Registry_Server") ; @@ -224,7 +224,7 @@ int main( int argc , char **argv ) } catch( const SALOME_Exception &ex ) { - MESSAGE( "Communication Error : " << ex.what() ) + MESSAGE( "Communication Error : " << ex.what() ); return EXIT_FAILURE ; } diff --git a/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx index 5eef8c963..34c4047b3 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx @@ -34,13 +34,13 @@ static SALOMEDSImpl_AttributeTreeNode* GetNode(SALOMEDS::AttributeTreeNode_ptr v SALOMEDSImpl_AttributeTreeNode* aResult = NULL; DF_Label aLabel = DF_Label::Label(aNode->Label(), value->Label()); if (aLabel.IsNull()) { - MESSAGE("SALOMEDS_AttributeTreeNode_i class: no such label") - MESSAGE("SALOMEDS_AttributeTreeNode_i class: no such label") + MESSAGE("SALOMEDS_AttributeTreeNode_i class: no such label"); + MESSAGE("SALOMEDS_AttributeTreeNode_i class: no such label"); return aResult; } if (!(aResult=(SALOMEDSImpl_AttributeTreeNode*)aLabel.FindAttribute(aNode->ID()))) { - MESSAGE("SALOMEDS_AttributeTreeNode_i class: no such attribute") - MESSAGE("SALOMEDS_AttributeTreeNode_i class: no such attribute") + MESSAGE("SALOMEDS_AttributeTreeNode_i class: no such attribute"); + MESSAGE("SALOMEDS_AttributeTreeNode_i class: no such attribute"); } return aResult; } diff --git a/src/SALOMEDS/SALOMEDS_Client.cxx b/src/SALOMEDS/SALOMEDS_Client.cxx index 3ef7d686d..26c11a419 100644 --- a/src/SALOMEDS/SALOMEDS_Client.cxx +++ b/src/SALOMEDS/SALOMEDS_Client.cxx @@ -246,7 +246,7 @@ static void Test() } catch(HDFexception) { - MESSAGE( "HDFexception ! " ) + MESSAGE("HDFexception ! "); } } @@ -275,19 +275,19 @@ int main(int argc, char** argv) orb->destroy(); } catch(CORBA::SystemException&) { - MESSAGE("Caught CORBA::SystemException." ) + MESSAGE("Caught CORBA::SystemException."); } catch(CORBA::Exception&) { - MESSAGE( "Caught CORBA::Exception." ) + MESSAGE("Caught CORBA::Exception."); } catch(omniORB::fatalException& fe) { //!< TODO: unused variable - MESSAGE( "Caught omniORB::fatalException:" ) - MESSAGE( " file: " << fe.file() ) - MESSAGE( " line: " << fe.line() ) - MESSAGE( " mesg: " << fe.errmsg() ) + MESSAGE("Caught omniORB::fatalException:"); + MESSAGE(" file: " << fe.file()); + MESSAGE(" line: " << fe.line()); + MESSAGE(" mesg: " << fe.errmsg()); } catch(...) { - MESSAGE( "Caught unknown exception." ) + MESSAGE("Caught unknown exception."); } return 0; } -- 2.39.2