From: Konstantin LEONTEV <konstantin.leontev@opencascade.com>
Date: Thu, 10 Nov 2022 16:23:10 +0000 (+0300)
Subject: [bos #32517][EDF] Dynamic logging: Removed balanced (void)0 part from the macros... 
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fkleontev%2F32517_dynamic_log_messages;p=modules%2Fkernel.git

[bos #32517][EDF] Dynamic logging: Removed balanced (void)0 part from the macros, so they could be used without ; at the end.
---

diff --git a/src/SALOMELocalTrace/utilities.h b/src/SALOMELocalTrace/utilities.h
index 52945c85d..aeea32f8d 100644
--- a/src/SALOMELocalTrace/utilities.h
+++ b/src/SALOMELocalTrace/utilities.h
@@ -105,23 +105,23 @@
 // --- the following MACROS can be enabled in debug and release versions
 // --- by SALOME_VERBOSE environment variable
 
-#define INFOS_COMPILATION if (SALOME::VerbosityActivated()) { MESS_BEGIN("COMPILED with ") << COMPILER \
+#define INFOS_COMPILATION { if (SALOME::VerbosityActivated()) { MESS_BEGIN("COMPILED with ") << COMPILER \
                                        << ", " << __DATE__ \
-                                       << " at " << __TIME__ << MESS_END } else (void)0
+                                       << " at " << __TIME__ << MESS_END }}
                                                                                 
 
-#define MESSAGE(msg) if (SALOME::VerbosityActivated()) {MESS_BEGIN("- Trace ") << msg << MESS_END} else (void)0
-#define SCRUTE(var)  if (SALOME::VerbosityActivated()) {MESS_BEGIN("- Trace ") << #var << "=" << var <<MESS_END} else (void)0
+#define MESSAGE(msg) { if (SALOME::VerbosityActivated()) {MESS_BEGIN("- Trace ") << msg << MESS_END}}
+#define SCRUTE(var)  { if (SALOME::VerbosityActivated()) {MESS_BEGIN("- Trace ") << #var << "=" << var <<MESS_END}}
 
 #define REPERE ("------- ")
-#define BEGIN_OF(msg) if (SALOME::VerbosityActivated()) {MESS_BEGIN(REPERE) << "Begin of: " << msg << MESS_END} else (void)0
-#define END_OF(msg)   if (SALOME::VerbosityActivated()) {MESS_BEGIN(REPERE) << "Normal end of: " << msg << MESS_END} else (void)0
+#define BEGIN_OF(msg) { if (SALOME::VerbosityActivated()) {MESS_BEGIN(REPERE) << "Begin of: " << msg << MESS_END}}
+#define END_OF(msg)   { if (SALOME::VerbosityActivated()) {MESS_BEGIN(REPERE) << "Normal end of: " << msg << MESS_END}}
 
 #ifndef ASSERT
 #define ASSERT(condition) \
-        if (SALOME::VerbosityActivated()) { \
+        { if (SALOME::VerbosityActivated()) { \
         if (!(condition)){INTERRUPTION("CONDITION "<<#condition<<" NOT VERIFIED")} \
-        }  else (void)0
+        }}
 #endif /* ASSERT */
 
 #endif /* ifndef UTILITIES_H */