X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f5d910492b0ffbccf3caf4b57eec434377a1314..dc4025af9a663583878b02e30073e29205ae5d9f:/include/wx/debug.h diff --git a/include/wx/debug.h b/include/wx/debug.h index 10966502ec..436a05ab29 100644 --- a/include/wx/debug.h +++ b/include/wx/debug.h @@ -178,9 +178,10 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse; get a warning about an unnamed struct not used to define an object!). */ -#define wxMAKE_ASSERT_NAME_HELPER(line) wxAssert_ ## line -#define wxMAKE_ASSERT_NAME(line) wxMAKE_ASSERT_NAME_HELPER(line) -#define wxMAKE_UNIQUE_ASSERT_NAME wxMAKE_ASSERT_NAME(__LINE__) +#define wxMAKE_ASSERT_NAME_HELPER(line) wxAssert_ ## line +#define wxMAKE_ASSERT_NAME(line) wxMAKE_ASSERT_NAME_HELPER(line) +#define wxMAKE_UNIQUE_ASSERT_NAME wxMAKE_ASSERT_NAME(__LINE__) +#define wxMAKE_UNIQUE_ASSERT_NAME2(text) wxMAKE_ASSERT_NAME(text) /* The second argument of this macro must be a valid C++ identifier and not a @@ -193,6 +194,9 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse; #define wxCOMPILE_TIME_ASSERT(expr, msg) \ struct wxMAKE_UNIQUE_ASSERT_NAME { unsigned int msg: expr; } +#define wxCOMPILE_TIME_ASSERT2(expr, msg, text) \ + struct wxMAKE_UNIQUE_ASSERT_NAME2(text) { unsigned int msg: expr; } + // helpers for wxCOMPILE_TIME_ASSERT below, for private use only #define wxMAKE_BITSIZE_MSG(type, size) type ## SmallerThan ## size ## Bits