Fix bugs #6078 and #9364

[lyx.git] / src / support / debug.h

diff --git a/src/support/debug.h b/src/support/debug.h
index 34258073b9bd7e64b26d25fc65ed40b7b6e3cdb1..216538958d62c70af970541e927c9937c5351b7f 100644 (file)
--- a/src/support/debug.h
+++ b/src/support/debug.h
@@ -20,7 +20,7 @@
 // Forward definitions do not work with libc++
 // but ios_base has already been defined in strfwd
 // if compiling with it
-#ifndef  _LIBCPP_VERSION
+#ifndef USE_LLVM_LIBCPP
 namespace std {
 
 class ios_base;
@@ -81,7 +81,7 @@ namespace Debug {
                ///
                WORKAREA   = (1 << 19),
                ///
-               INSETTEXT  = (1 << 20),
+               CLIPBOARD  = (1 << 20),
                ///
                GRAPHICS   = (1 << 21),
                /// change tracking
@@ -142,7 +142,8 @@ inline void operator|=(Debug::Type & d1, Debug::Type d2)
 class LyXErr
 {
 public:
-       LyXErr(): dt_(Debug::NONE), enabled_(true), second_enabled_(false) {}
+       LyXErr(): dt_(Debug::NONE), stream_(0), enabled_(true),
+                 second_stream_(0), second_enabled_(false) {}
        
        /// Disable the stream completely
        void disable();