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

define __WXFUNCTION__ instead of redefining the (semi-)standard __FUNCTION__ which could result in conflicts

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-03-22 19:32:28 +00:00
parent fd05688e22
commit fa3bd1aaea
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/debug.h
View File

@ -48,11 +48,13 @@
#endif /* __WXDEBUG__ */ #endif /* __WXDEBUG__ */
/* TODO: add more compilers supporting __FUNCTION__ */ /* TODO: add more compilers supporting __FUNCTION__ */
#if !defined(__GNUC__) && \ #if defined(__GNUC__) || \
!(defined(_MSC_VER) && _MSC_VER >= 1300) && \ (defined(_MSC_VER) && _MSC_VER >= 1300) || \
!defined(__FUNCTION__) defined(__FUNCTION__)
/* no __FUNCTION__ support, still define it to avoid #ifdefs elsewhere */ #define __WXFUNCTION__ __FUNCTION__
#define __FUNCTION__ (NULL) #else
/* still define __WXFUNCTION__ to avoid #ifdefs elsewhere */
#define __WXFUNCTION__ (NULL)
#endif #endif
/* ---------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------- */
@ -108,7 +110,7 @@
if ( cond ) \ if ( cond ) \
; \ ; \
else \ else \
wxOnAssert(__TFILE__, __LINE__, __FUNCTION__, _T(#cond), msg) wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(#cond), msg)
/* special form of assert: always triggers it (in debug mode) */ /* special form of assert: always triggers it (in debug mode) */
#define wxFAIL wxFAIL_MSG(NULL) #define wxFAIL wxFAIL_MSG(NULL)
@ -118,7 +120,7 @@
/* FAIL with some message and a condition */ /* FAIL with some message and a condition */
#define wxFAIL_COND_MSG(cond, msg) \ #define wxFAIL_COND_MSG(cond, msg) \
wxOnAssert(__TFILE__, __LINE__, __FUNCTION__, _T(cond), msg) wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, _T(cond), msg)
/* an assert helper used to avoid warning when testing constant expressions, */ /* an assert helper used to avoid warning when testing constant expressions, */
/* i.e. wxASSERT( sizeof(int) == 4 ) can generate a compiler warning about */ /* i.e. wxASSERT( sizeof(int) == 4 ) can generate a compiler warning about */