From 39423ef8de027394553b4ce6d2b2e78f0cafd10f Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Tue, 12 Feb 2008 13:23:57 -0600 Subject: [PATCH] Fix error in ASSERT macro. --- debug.h | 2 +- grid.C | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debug.h b/debug.h index 1acfcca..1c25736 100644 --- a/debug.h +++ b/debug.h @@ -100,7 +100,7 @@ warnf ( warning_t level, #ifndef NDEBUG #define DEBUG( fmt, args... ) warnf( W_MESSAGE, __MODULE__, __FILE__, __FUNCTION__, __LINE__, fmt, ## args ) -#define ASSERT( pred, fmt, args... ) ( do { if ( ! (pred) ) warnf( W_ASSERTION, __MODULE__, __FILE__, __FUNCTION__, __LINE__, fmd, ## args ); abort(); } while ( 0 ) ) +#define ASSERT( pred, fmt, args... ) do { if ( ! (pred) ) { warnf( W_ASSERTION, __MODULE__, __FILE__, __FUNCTION__, __LINE__, fmt, ## args ); abort(); } } while ( 0 ) #else #define DEBUG( fmt, args... ) #define ASSERT( pred, fmt, args... ) diff --git a/grid.C b/grid.C index b38e516..05a46de 100644 --- a/grid.C +++ b/grid.C @@ -634,8 +634,8 @@ Grid::draw ( Canvas *c, int bx, int by, int bw, int bh ) if ( ! e->is_note_on() ) continue; - tick_t ts = e->timestamp(); + ASSERT( e->link(), "found a non-linked note" ); tick_t tse = e->link()->timestamp();