From: Julian Smart Date: Fri, 6 Dec 2002 22:49:58 +0000 (+0000) Subject: Applied fix for VC++ 7 which treats __LINE__ slightly differently, apparently. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/409e38cd653526e81b4d7fc63c0d68d4c1258809?ds=sidebyside Applied fix for VC++ 7 which treats __LINE__ slightly differently, apparently. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/debug.h b/include/wx/debug.h index 4f4230f6c5..49a15d363b 100644 --- a/include/wx/debug.h +++ b/include/wx/debug.h @@ -179,11 +179,13 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse; particular, this is why we define a struct and not an object (which would result in a warning about unused variable) and a named struct (otherwise we'd get a warning about an unnamed struct not used to define an object!). + The _n__ part is to stop VC++ 7 being confused since it encloses __LINE++ in + parentheses. */ #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_NAME wxMAKE_ASSERT_NAME(_n___ ## __LINE__) #define wxMAKE_UNIQUE_ASSERT_NAME2(text) wxMAKE_ASSERT_NAME(text) /*