summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-04-15 15:00:00 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-04-15 15:00:00 +0000
commit94b18ba9880682146849fccd555215e677463e68 (patch)
tree5995e76c67b31a426e9b8be95ebb67d8ddd54270
parent62c63d34028234e3296081e49493f0eba92fc74b (diff)
INTEGRATION: CWS dbgmacros1 (1.3.32); FILE MERGED
2003/04/09 10:37:43 kso 1.3.32.1: #108413# - debug macro unification.
-rw-r--r--cosv/inc/cosv/csv_env.hxx23
1 files changed, 21 insertions, 2 deletions
diff --git a/cosv/inc/cosv/csv_env.hxx b/cosv/inc/cosv/csv_env.hxx
index eb2979a0e3ac..5cff0840ea49 100644
--- a/cosv/inc/cosv/csv_env.hxx
+++ b/cosv/inc/cosv/csv_env.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: csv_env.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: np $ $Date: 2002-06-25 15:15:46 $
+ * last change: $Author: vg $ $Date: 2003-04-15 16:00:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -170,10 +170,29 @@ void PerformAssertion(
#define csv_noimpl(x) ::csv::PerformAssertion( "Functon " #x " is not yet implemented.", __FILE__, __LINE__)
#define csv_exception ::csv::PerformAssertion( "Exception to be raised.", __FILE__, __LINE__)
#else
+
+// Save NDEBUG state
+#ifdef NDEBUG
+#define CSV_CSV_ENV_HXX_HAD_NDEBUG
+#undef NDEBUG
+#endif
+
+#if OSL_DEBUG_LEVEL == 0
+#define NDEBUG
+#endif
#include <assert.h>
+
#define csv_assert(x) assert(x);
#define csv_noimpl(x) assert(x);
#define csv_exception assert(x);
+
+// Restore NDEBUG state
+#ifdef CSV_CSV_ENV_HXX_HAD_NDEBUG
+#define NDEBUG
+#else
+#undef NDEBUG
+#endif
+
#endif
#else // #ifndef CSV_NO_ASSERTIONS else