AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The wxMAKE_UNIQUE_ASSERT_NAME fix for VC++ does not work for MetroWerks CW.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2002-12-09 14:20:06 +00:00
parent 678b263756
commit 1e702ab351
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/debug.h
View File

@ -182,12 +182,17 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
result in a warning about unused variable) and a named struct (otherwise we'd 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!). 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 The _n__ part is to stop VC++ 7 being confused since it encloses __LINE++ in
parentheses. parentheses. Unfortunately this does not work with MetroWerks CW so this fix
is being limited to VC++.
*/ */
#define wxMAKE_ASSERT_NAME_HELPER(line) wxAssert_ ## line #define wxMAKE_ASSERT_NAME_HELPER(line) wxAssert_ ## line
#define wxMAKE_ASSERT_NAME(line) wxMAKE_ASSERT_NAME_HELPER(line) #define wxMAKE_ASSERT_NAME(line) wxMAKE_ASSERT_NAME_HELPER(line)
#ifdef __VISUALC__
#define wxMAKE_UNIQUE_ASSERT_NAME wxMAKE_ASSERT_NAME(_n___ ## __LINE__) #define wxMAKE_UNIQUE_ASSERT_NAME wxMAKE_ASSERT_NAME(_n___ ## __LINE__)
#else
#define wxMAKE_UNIQUE_ASSERT_NAME wxMAKE_ASSERT_NAME(__LINE__)
#endif
#define wxMAKE_UNIQUE_ASSERT_NAME2(text) wxMAKE_ASSERT_NAME(text) #define wxMAKE_UNIQUE_ASSERT_NAME2(text) wxMAKE_ASSERT_NAME(text)
/* /*