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

restored old wxCOMPILE_TIME_ASSERT2 definition as the new one doesn't work with VC6 E&C

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-10 23:15:17 +00:00
parent dfa4a244f0
commit 7bb688a899
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/debug.h
View File

@@ -184,7 +184,6 @@ WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse;
*/ */
#define wxMAKE_UNIQUE_ASSERT_NAME wxMAKE_UNIQUE_NAME(wxAssert_) #define wxMAKE_UNIQUE_ASSERT_NAME wxMAKE_UNIQUE_NAME(wxAssert_)
#define wxMAKE_UNIQUE_ASSERT_NAME2(text) wxMAKE_UNIQUE_NAME(text)
/* /*
The second argument of this macro must be a valid C++ identifier and not a The second argument of this macro must be a valid C++ identifier and not a
@@ -197,6 +196,13 @@ WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse;
#define wxCOMPILE_TIME_ASSERT(expr, msg) \ #define wxCOMPILE_TIME_ASSERT(expr, msg) \
struct wxMAKE_UNIQUE_ASSERT_NAME { unsigned int msg: expr; } struct wxMAKE_UNIQUE_ASSERT_NAME { unsigned int msg: expr; }
/*
When using VC++ 6 with "Edit and Continue" on, the compiler completely
mishandles __LINE__ and so wxCOMPILE_TIME_ASSERT() doesn't work, provide a
way to make "unique" assert names by specifying a unique prefix explicitly
*/
#define wxMAKE_UNIQUE_ASSERT_NAME2(text) wxCONCAT(wxAssert_, text)
#define wxCOMPILE_TIME_ASSERT2(expr, msg, text) \ #define wxCOMPILE_TIME_ASSERT2(expr, msg, text) \
struct wxMAKE_UNIQUE_ASSERT_NAME2(text) { unsigned int msg: expr; } struct wxMAKE_UNIQUE_ASSERT_NAME2(text) { unsigned int msg: expr; }