Some cleanup.

[pdclib] / includes / assert.h

diff --git a/includes/assert.h b/includes/assert.h
index e4363f510f42ad4768d35ed28cd523452da61fa8..ebf4d8c15b4eac6224415223754ba50459264ebd 100644 (file)
--- a/includes/assert.h
+++ b/includes/assert.h
@@ -4,7 +4,7 @@
 // Public Domain C Library - http://pdclib.sourceforge.net
 // This code is Public Domain. Use, modify, and redistribute at will.
 // ----------------------------------------------------------------------------
-// Provides the debug macro assert().
+// Diagnostics
 // ----------------------------------------------------------------------------
 
 #ifndef __ASSERT_H
@@ -22,16 +22,13 @@ void __assert( char const * const expression, // the tested expression
 // ----------------------------------------------------------------------------
 // DEFINES
 
-// TODO: <void expression> is given as (void) 0, which might give a "C style
-// cast" warning under C++. Find a void expression that does not give warnings.
-
 // TODO: Check the macro for if-compatibility.
 
 #undef assert
 #if defined NDEBUG
-#define assert( x ) <void expression>
+#define assert( x ) ( (void) 0 )
 #else
-#define assert( x ) ( x ) ? <void expression> \
+#define assert( x ) ( x ) ? ( (void) 0 ) \
                           :  __assert( #x, __FILE__, __func__, __LINE__ )
 #endif