Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Experimental simplification of the code by using MWERKS version

Browse Source 
for all compilers.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2008-07-05 18:05:33 +00:00
parent 961d941c0d
commit 0d65494402
1 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/wx/debug.h
View File

@@ -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__)
/* 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)
#else
#define wxASSERT_MSG(cond, msg) \
if ( cond ) \
; \
else \
wxOnAssert(__FILE__, __LINE__, __WXFUNCTION__, #cond, msg)
#endif
/* special form of assert: always triggers it (in debug mode) */
#define wxFAIL wxFAIL_MSG((const char*)NULL)
@@ -246,9 +238,7 @@
/* 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) \
#define wxCHECK2_MSG(cond, op, msg) \
if ( cond ) \
{} \
else \
@@ -257,17 +247,6 @@
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
/* special form of wxCHECK2: as wxCHECK, but for use in void functions */
/* */