don't define comparison operators taking wxStrings when wxUSE_STL == 1

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

diff --git a/include/wx/debug.h b/include/wx/debug.h
index f353646e8bb46eff5c88805de1fa1a5b8cc5acdf..c030f2abbaecf81f9da2f9153cf83dfc4df4fb7a 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -1,12 +1,12 @@
 /**
 /**

-*  Name:        wx/debug.h 
-*  Purpose:     Misc debug functions and macros 
-*  Author:      Vadim Zeitlin 
+*  Name:        wx/debug.h
+*  Purpose:     Misc debug functions and macros
+*  Author:      Vadim Zeitlin

 *  Modified by: Ryan Norton (Converted to C)
 *  Modified by: Ryan Norton (Converted to C)

-*  Created:     29/01/98 
-*  RCS-ID:      $Id$ 
-*  Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr> 
-*  Licence:     wxWindows licence 
+*  Created:     29/01/98
+*  RCS-ID:      $Id$
+*  Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+*  Licence:     wxWindows licence

 */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */


@@ -52,7 +52,7 @@
 /*  */
 /*  All debugging macros rely on ASSERT() which in turn calls user-defined */
 /*  OnAssert() function. To keep things simple, it's called even when the */
 /*  */
 /*  All debugging macros rely on ASSERT() which in turn calls user-defined */
 /*  OnAssert() function. To keep things simple, it's called even when the */

-/*  expression is TRUE (i.e. everything is ok) and by default does nothing: just */
+/*  expression is true (i.e. everything is ok) and by default does nothing: just */

 /*  returns the same value back. But if you redefine it to do something more sexy */
 /*  (popping up a message box in your favourite GUI, sending you e-mail or */
 /*  whatever) it will affect all ASSERTs, FAILs and CHECKs in your code. */
 /*  returns the same value back. But if you redefine it to do something more sexy */
 /*  (popping up a message box in your favourite GUI, sending you e-mail or */
 /*  whatever) it will affect all ASSERTs, FAILs and CHECKs in your code. */


@@ -125,7 +125,7 @@
 #endif  /* __WXDEBUG__ */
 
 #ifdef __cplusplus
 #endif  /* __WXDEBUG__ */
 
 #ifdef __cplusplus

-    /*  Use of wxFalse instead of FALSE suppresses compiler warnings about testing */
+    /*  Use of wxFalse instead of false suppresses compiler warnings about testing */

     /*  constant expression */
     WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse;
 #endif
     /*  constant expression */
     WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse;
 #endif


@@ -198,8 +198,17 @@
 
  It may be used both within a function and in the global scope.
 */
 
  It may be used both within a function and in the global scope.
 */

-#define wxCOMPILE_TIME_ASSERT(expr, msg) \
-    struct wxMAKE_UNIQUE_ASSERT_NAME { unsigned int msg: expr; }
+#ifdef __WATCOMC__
+    /* avoid "unused symbol" warning */
+    #define wxCOMPILE_TIME_ASSERT(expr, msg) \
+        class wxMAKE_UNIQUE_ASSERT_NAME { \
+          unsigned int msg: expr; \
+          wxMAKE_UNIQUE_ASSERT_NAME() { wxUnusedVar(msg); } \
+        }
+#else
+    #define wxCOMPILE_TIME_ASSERT(expr, msg) \
+        struct wxMAKE_UNIQUE_ASSERT_NAME { unsigned int msg: expr; }
+#endif

 
 /*
    When using VC++ 6 with "Edit and Continue" on, the compiler completely
 
 /*
    When using VC++ 6 with "Edit and Continue" on, the compiler completely


@@ -208,8 +217,17 @@
  */
 #define wxMAKE_UNIQUE_ASSERT_NAME2(text) wxCONCAT(wxAssert_, text)
 
  */
 #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; }
+#ifdef __WATCOMC__
+    /* avoid "unused symbol" warning */
+    #define wxCOMPILE_TIME_ASSERT2(expr, msg, text) \
+        class wxMAKE_UNIQUE_ASSERT_NAME2(text) { \
+          unsigned int msg: expr; \
+          wxMAKE_UNIQUE_ASSERT_NAME2(text) { wxUnusedVar(msg); } \
+        }
+#else
+    #define wxCOMPILE_TIME_ASSERT2(expr, msg, text) \
+        struct wxMAKE_UNIQUE_ASSERT_NAME2(text) { unsigned int msg: expr; }
+#endif

 
 /*  helpers for wxCOMPILE_TIME_ASSERT below, for private use only */
 #define wxMAKE_BITSIZE_MSG(type, size) type ## SmallerThan ## size ## Bits
 
 /*  helpers for wxCOMPILE_TIME_ASSERT below, for private use only */
 #define wxMAKE_BITSIZE_MSG(type, size) type ## SmallerThan ## size ## Bits