From 7bb688a899ce4166716b13cffbd31d343d2fbc9e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 10 Jul 2003 23:15:17 +0000 Subject: [PATCH] restored old wxCOMPILE_TIME_ASSERT2 definition as the new one doesn't work with VC6 E&C git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/debug.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/wx/debug.h b/include/wx/debug.h index ccad73ccba..649550d08c 100644 --- a/include/wx/debug.h +++ b/include/wx/debug.h @@ -184,7 +184,6 @@ WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse; */ #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 @@ -197,6 +196,13 @@ WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse; #define wxCOMPILE_TIME_ASSERT(expr, msg) \ 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) \ struct wxMAKE_UNIQUE_ASSERT_NAME2(text) { unsigned int msg: expr; } -- 2.45.2