From 0d65494402ed0bc5f4c5b3d37736afad436a1c48 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Sat, 5 Jul 2008 18:05:33 +0000 Subject: [PATCH] Experimental simplification of the code by using MWERKS version for all compilers. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/debug.h | 53 ++++++++++++++++------------------------------------- 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/include/wx/debug.h b/include/wx/debug.h index 4d678a7..fab0b7c 100644 --- a/include/wx/debug.h +++ b/include/wx/debug.h @@ -172,21 +172,13 @@ /* assert with additional message explaining its cause */ - /* compilers can give a warning (such as "possible unwanted ;") when using */ - /* the default definition of wxASSERT_MSG so we provide an alternative */ - #if defined(__MWERKS__) - #define wxASSERT_MSG(cond, msg) \ - if ( cond ) \ - {} \ - else \ - wxOnAssert(__FILE__, __LINE__, __WXFUNCTION__, #cond, msg) - #else - #define wxASSERT_MSG(cond, msg) \ - if ( cond ) \ - ; \ - else \ - wxOnAssert(__FILE__, __LINE__, __WXFUNCTION__, #cond, msg) - #endif + /* Note: some compilers will give a warning (such as */ + /* "possible unwanted ;") when using a ";" instead of the "{}". */ + #define wxASSERT_MSG(cond, msg) \ + if ( cond ) \ + {} \ + else \ + wxOnAssert(__FILE__, __LINE__, __WXFUNCTION__, #cond, msg) /* special form of assert: always triggers it (in debug mode) */ #define wxFAIL wxFAIL_MSG((const char*)NULL) @@ -246,28 +238,15 @@ /* as wxCHECK2 but with a message explaining why we fail */ -/* see comment near the definition of wxASSERT_MSG for the # if/else reason */ -#if defined(__MWERKS__) - #define wxCHECK2_MSG(cond, op, msg) \ - if ( cond ) \ - {} \ - else \ - { \ - wxFAIL_COND_MSG(#cond, msg); \ - op; \ - } \ - struct wxDummyCheckStruct /* just to force a semicolon */ -#else - #define wxCHECK2_MSG(cond, op, msg) \ - if ( cond ) \ - ; \ - else \ - { \ - wxFAIL_COND_MSG(#cond, msg); \ - op; \ - } \ - struct wxDummyCheckStruct /* just to force a semicolon */ -#endif +#define wxCHECK2_MSG(cond, op, msg) \ + if ( cond ) \ + {} \ + else \ + { \ + wxFAIL_COND_MSG(#cond, msg); \ + op; \ + } \ + struct wxDummyCheckStruct /* just to force a semicolon */ /* special form of wxCHECK2: as wxCHECK, but for use in void functions */ /* */ -- 2.7.4