anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 14:29:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Wrap the definition of debug_trait::DEBUG with preprocessor guards

Browse Source 
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
This commit is contained in:
Angus Leeming 2004-05-20 09:35:30 +00:00
parent 8756f3a7f0
commit 3cac00e714
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/support/ChangeLog
View File

@ -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> 2004-04-27 Angus Leeming <leeming@lyx.org>
* path_defines.{h,C.in}: expose top_srcdir, renamed from * path_defines.{h,C.in}: expose top_srcdir, renamed from

10
src/support/debugstream.h
View File

@ -16,6 +16,11 @@
#include <boost/test/detail/nullstream.hpp> #include <boost/test/detail/nullstream.hpp>
#ifdef DEBUG
# define TEMPORARY_DEBUG_MACRO DEBUG
# undef DEBUG
#endif
struct debug_trait { struct debug_trait {
enum type { enum type {
NONE = 0, 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, template <class dtrait,
class charT = char, class charT = char,