From: Angus Leeming <leeming@lyx.org>
Date: Thu, 20 May 2004 09:35:30 +0000 (+0000)
Subject: Wrap the definition of debug_trait::DEBUG with preprocessor guards
X-Git-Tag: 1.6.10~15210
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3cac00e71405b041017390e9e63c0e98b55db904;p=features.git

Wrap the definition of debug_trait::DEBUG with preprocessor guards
that protect against a name clash with a macro DEBUG.
Such a macro is defined by the Qt library...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8771 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index be363b7e23..de661d00f2 100644
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-20  Angus Leeming  <leeming@lyx.org>
+
+	* debugstream.h: wrap the definition of debug_trait::DEBUG with
+	preprocessor guards that protect against a name clash with a
+	macro DEBUG. Such a macro is defined by the Qt library...
+
 2004-04-27  Angus Leeming  <leeming@lyx.org>
 
 	* path_defines.{h,C.in}: expose top_srcdir, renamed from
diff --git a/src/support/debugstream.h b/src/support/debugstream.h
index 6b7334477b..c41d4d94b1 100644
--- a/src/support/debugstream.h
+++ b/src/support/debugstream.h
@@ -16,6 +16,11 @@
 
 #include <boost/test/detail/nullstream.hpp>
 
+#ifdef DEBUG
+# define TEMPORARY_DEBUG_MACRO DEBUG
+# undef DEBUG
+#endif
+
 struct debug_trait {
 	enum type {
 		NONE   = 0,
@@ -35,6 +40,11 @@ struct debug_trait {
 	}
 };
 
+#ifdef TEMPORARY_DEBUG_MACRO
+# define DEBUG TEMPORARY_DEBUG_MACRO
+# undef TEMPORARY_DEBUG_MACRO
+#endif
+
 
 template <class dtrait,
 	  class charT = char,