prepare Qt 5.6 builds

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

diff --git a/src/support/debug.h b/src/support/debug.h
index fc7f72eff4b9313118e88f73dd1ad5d299bdbbd1..216538958d62c70af970541e927c9937c5351b7f 100644 (file)
--- a/src/support/debug.h
+++ b/src/support/debug.h
@@ -17,6 +17,10 @@
 
 #include "support/strfwd.h"
 
+// Forward definitions do not work with libc++
+// but ios_base has already been defined in strfwd
+// if compiling with it
+#ifndef USE_LLVM_LIBCPP
 namespace std {
 
 class ios_base;
@@ -25,6 +29,7 @@ template<typename CharT, typename Traits> class basic_streambuf;
 typedef basic_streambuf<char, char_traits<char> > streambuf;
 
 }
+#endif
 
 
 namespace lyx {
@@ -76,7 +81,7 @@ namespace Debug {
                ///
                WORKAREA   = (1 << 19),
                ///
-               INSETTEXT  = (1 << 20),
+               CLIPBOARD  = (1 << 20),
                ///
                GRAPHICS   = (1 << 21),
                /// change tracking
@@ -124,6 +129,7 @@ namespace Debug {
        /// Show all the possible tags that can be used for debugging
        void showTags(std::ostream & os);
 
+
 } // namespace Debug
 
 
@@ -136,7 +142,8 @@ inline void operator|=(Debug::Type & d1, Debug::Type d2)
 class LyXErr
 {
 public:
-       LyXErr(): 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();
@@ -156,7 +163,7 @@ public:
        bool enabled() const { return enabled_; }
 
        /// Returns second stream
-       std::ostream & secondStream() { return *second_stream_; };
+       std::ostream & secondStream() { return *second_stream_; }
        /// Sets second stream
        void setSecondStream(std::ostream * os) 
                { second_enabled_ = (second_stream_ = os); }
@@ -170,6 +177,9 @@ public:
        /// Returns true if t is part of the current debug level
        bool debugging(Debug::Type t = Debug::ANY) const;
 
+       ///
+       static char const * stripName(char const *);
+
 private:
        /// The current debug level
        Debug::Type dt_;
@@ -207,7 +217,7 @@ extern LyXErr lyxerr;
 #      include <boost/current_function.hpp>
 #      define CURRENT_POSITION BOOST_CURRENT_FUNCTION ": "
 #else
-# define CURRENT_POSITION __FILE__ << "(" << __LINE__ << "): "
+# define CURRENT_POSITION lyx::LyXErr::stripName(__FILE__) << " (" << __LINE__ << "): "
 #endif
 
 #define LYXERR(type, msg) \