Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / debug.h

diff --git a/src/debug.h b/src/debug.h
index 4df1f6e0a813e4a81ab100271a0984d9132dc6ec..9c86d830ca440c34088ed14b0952339a7944901b 100644 (file)
--- a/src/debug.h
+++ b/src/debug.h
@@ -65,17 +65,19 @@ struct Debug {
                ///
                DEPEND     = (1 << 16),
                ///
-               INSETS     = (1 << 17)
+               INSETS     = (1 << 17),
+               ///
+               FILES      = (1 << 18)
        };
        ///
-       static const type ANY = type(INFO | INIT | KEY | GUI |
-                                    PARSER | LYXRC | KBMAP | LATEX |
-                                    MATHED | FONT | TCLASS | LYXVC |
-                                    LYXSERVER | ROFF | ACTION | LYXLEX |
-                                    DEPEND | INSETS);
+//     static const type ANY = type(INFO | INIT | KEY | GUI |
+//                                  PARSER | LYXRC | KBMAP | LATEX |
+//                                  MATHED | FONT | TCLASS | LYXVC |
+//                                  LYXSERVER | ROFF | ACTION | LYXLEX |
+//                                  DEPEND | INSETS);
        ///
-       friend inline void operator|=(Debug::type & d1, Debug::type d2);
-       
+       static type const ANY;
+
        /** A function to convert symbolic string names on debug levels
            to their numerical value.
        */
@@ -94,7 +96,7 @@ struct Debug {
 
 
 inline
-void operator|= (Debug::type & d1, Debug::type d2)
+void operator|=(Debug::type & d1, Debug::type d2)
 {
        d1 = static_cast<Debug::type>(d1 | d2);
 }