Corrected a few macro definitions to make them more function-like and safe to

use.

3 files changed, 5 insertions, 5 deletions

diff --git a/src/protocolhttp.cpp b/src/protocolhttp.cpp
index f512eda..534cb02 100644
--- a/src/protocolhttp.cpp
+++ b/src/protocolhttp.cpp
@@ -33,7 +33,7 @@ void Bu::ProtocolHttp::onNewConnection( Bu::Client *pClient )
         iState = 0;
 }
 
-#define SDB( i ) { }
+#define SDB( i ) (void)0
 //#define SDB( i ) printf("state %d: %d, \"%s\"\n", i, tt, sToken.getStr() )
 
 void Bu::ProtocolHttp::onNewData( Bu::Client *pClient )
diff --git a/src/trace.h b/src/trace.h
index 91e2094..e115d66 100644
--- a/src/trace.h
+++ b/src/trace.h
@@ -34,7 +34,7 @@ namespace Bu
                                 n++;                                                                    \
                                 break;                                                                  \
                         }                                                                                       \
-                }
+                } (void)0
         
         template<typename t1> void __tracer( const char *pf, t1 &v1 )
         {
@@ -163,7 +163,7 @@ namespace Bu
 #ifdef BU_TRACE
 # define TRACE(args...) Bu::__tracer( __PRETTY_FUNCTION__, ##args )
 #else
-# define TRACE(args...) {}
+# define TRACE(args...) (void)0
 #endif
 
 #endif
diff --git a/src/unitsuite.h b/src/unitsuite.h
index d281e6a..d27e322 100644
--- a/src/unitsuite.h
+++ b/src/unitsuite.h
@@ -105,7 +105,7 @@ namespace Bu
 #define unitTest( tst ) if( !(tst) )                                                    \
 {                                                                                                                               \
         throw Bu::UnitSuite::Failed( #tst, __FILE__, __LINE__ );        \
-}
-#define unitFailed( msg ) throw Bu::UnitSuite::Failed(msg, __FILE__, __LINE__);
+} else (void)0
+#define unitFailed( msg ) throw Bu::UnitSuite::Failed(msg, __FILE__, __LINE__)
 
 #endif