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

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

diff --git a/include/wx/debug.h b/include/wx/debug.h
index ba28e3ca0ceb271a6fa07a4728140693bfea48cd..93f394a60b1301d07f847e5c063c5e54b9eb61fc 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -182,12 +182,17 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
   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
   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.
+  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(line)            wxMAKE_ASSERT_NAME_HELPER(line)
  */
 
 #define wxMAKE_ASSERT_NAME_HELPER(line)     wxAssert_ ## 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)
 
 /*