Applied fix for VC++ 7 which treats __LINE__ slightly differently, apparently.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -179,11 +179,13 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
 | 
				
			|||||||
  particular, this is why we define a struct and not an object (which would
 | 
					  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
 | 
					  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
 | 
				
			||||||
 | 
					  parentheses.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#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)
 | 
				
			||||||
#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)
 | 
					#define wxMAKE_UNIQUE_ASSERT_NAME2(text)    wxMAKE_ASSERT_NAME(text)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user