removed special definition of wxCOMPILE_TIME_ASSERT2, keep it only for compatibility

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/debug.h b/include/wx/debug.h
index 3b8387efb37cbeaf508efc971197c51b949924f0..6af819ed92505c76a9c23832539a66f6f084d421 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -201,15 +201,9 @@
 #define wxCOMPILE_TIME_ASSERT(expr, msg) \
     struct wxMAKE_UNIQUE_ASSERT_NAME { unsigned int msg: expr; }
 
 #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; }
+/* for compatibility only, don't use any more, not needed */
+#define wxCOMPILE_TIME_ASSERT2(expr, msg, text) wxCOMPILE_TIME_ASSERT(expr, msg)

 
 /*  helpers for wxCOMPILE_TIME_ASSERT below, for private use only */
 #define wxMAKE_BITSIZE_MSG(type, size) type ## SmallerThan ## size ## Bits
 
 /*  helpers for wxCOMPILE_TIME_ASSERT below, for private use only */
 #define wxMAKE_BITSIZE_MSG(type, size) type ## SmallerThan ## size ## Bits