From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 9 Dec 2002 14:20:06 +0000 (+0000)
Subject: The wxMAKE_UNIQUE_ASSERT_NAME fix for VC++ does not work for MetroWerks CW.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1e702ab351f24530b90709025ac52a3a1c96b3d8?ds=inline

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 ba28e3ca0c..93f394a60b 100644
--- 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
-  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)
+#ifdef __VISUALC__
 #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)
 
 /*