From fa3bd1aaeaa313b190e59acdcf54fe8e72436057 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 22 Mar 2006 19:32:28 +0000 Subject: [PATCH] define __WXFUNCTION__ instead of redefining the (semi-)standard __FUNCTION__ which could result in conflicts git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/debug.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/include/wx/debug.h b/include/wx/debug.h index 50d938e1a9..f0cb8a5d5e 100644 --- a/include/wx/debug.h +++ b/include/wx/debug.h @@ -48,11 +48,13 @@ #endif /* __WXDEBUG__ */ /* TODO: add more compilers supporting __FUNCTION__ */ -#if !defined(__GNUC__) && \ - !(defined(_MSC_VER) && _MSC_VER >= 1300) && \ - !defined(__FUNCTION__) - /* no __FUNCTION__ support, still define it to avoid #ifdefs elsewhere */ - #define __FUNCTION__ (NULL) +#if defined(__GNUC__) || \ + (defined(_MSC_VER) && _MSC_VER >= 1300) || \ + defined(__FUNCTION__) + #define __WXFUNCTION__ __FUNCTION__ +#else + /* still define __WXFUNCTION__ to avoid #ifdefs elsewhere */ + #define __WXFUNCTION__ (NULL) #endif /* ---------------------------------------------------------------------------- */ @@ -108,7 +110,7 @@ if ( cond ) \ ; \ 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) */ #define wxFAIL wxFAIL_MSG(NULL) @@ -118,7 +120,7 @@ /* FAIL with some message and a condition */ #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, */ /* i.e. wxASSERT( sizeof(int) == 4 ) can generate a compiler warning about */ -- 2.45.2