Header Cosmetics

[wxWidgets.git] / include / wx / debug.h

diff --git a/include/wx/debug.h b/include/wx/debug.h
index 10e902d5c6266ba0573a04369f56fe61cce04ed8..1bb9ded462a094e7f4051deaed809796684ff774 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -68,7 +68,7 @@
 // Macros which are completely disabled in 'release' mode
 //
 // NB: these functions are implemented in src/common/appcmn.cpp
-#ifdef  __WXDEBUG__
+#if defined(__cplusplus) && defined(__WXDEBUG__)
   /*
     this function may be redefined to do something non trivial and is called
     whenever one of debugging macros fails (i.e. condition is false in an
@@ -122,9 +122,12 @@
   #define wxASSERT_MSG(x, m)
 #endif  //__WXDEBUG__
 
-// Use of wxFalse instead of FALSE suppresses compiler warnings about testing
-// constant expression
-WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse;
+#ifdef __cplusplus
+    // Use of wxFalse instead of FALSE suppresses compiler warnings about testing
+    // constant expression
+    WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse;
+#endif
+
 #define wxAssertFailure wxFalse
 
 // special form of assert: always triggers it (in debug mode)
@@ -181,19 +184,9 @@ WXDLLIMPEXP_DATA_BASE(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. Unfortunately this does not work with other compilers, so
-  we will only enable it when we know the _precise_ symbols to test for.
  */
 
-#define wxMAKE_ASSERT_NAME_HELPER(line)     wxAssert_ ## line
-#define wxMAKE_ASSERT_NAME(line)            wxMAKE_ASSERT_NAME_HELPER(line)
-#if 0
-#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_NAME           wxMAKE_UNIQUE_NAME(wxAssert_)
 
 /*
   The second argument of this macro must be a valid C++ identifier and not a
@@ -206,6 +199,13 @@ WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse;
 #define wxCOMPILE_TIME_ASSERT(expr, msg) \
     struct wxMAKE_UNIQUE_ASSERT_NAME { unsigned int msg: expr; }
 
+/*
+   When using VC++ 6 with "Edit and Continue" on, the compiler completely
+   mishandles __LINE__ and so wxCOMPILE_TIME_ASSERT() doesn't work, provide a
+   way to make "unique" assert names by specifying a unique prefix explicitly
+ */
+#define wxMAKE_UNIQUE_ASSERT_NAME2(text) wxCONCAT(wxAssert_, text)
+
 #define wxCOMPILE_TIME_ASSERT2(expr, msg, text) \
     struct wxMAKE_UNIQUE_ASSERT_NAME2(text) { unsigned int msg: expr; }
 
@@ -226,11 +226,13 @@ WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse;
 //
 // currently this only really works under Mac in CodeWarrior builds, it always
 // returns false otherwise
-#ifdef __WXMAC__
-    extern bool WXDLLIMPEXP_BASE wxIsDebuggerRunning();
-#else // !Mac
-    inline bool wxIsDebuggerRunning() { return false; }
-#endif // Mac/!Mac
+#ifdef __cplusplus
+    #ifdef __WXMAC__
+        extern bool WXDLLIMPEXP_BASE wxIsDebuggerRunning();
+    #else // !Mac
+        inline bool wxIsDebuggerRunning() { return false; }
+    #endif // Mac/!Mac
+#endif //__cplusplus
 
 #endif  // _WX_DEBUG_H_