X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdebug.h;h=b98dfd0eab5fe988e75121907bd4045b04d75873;hb=127e5b1955af5edc9000c8c8c9fb40494a5f2096;hp=34258073b9bd7e64b26d25fc65ed40b7b6e3cdb1;hpb=065db6806771190d12d37d64c4c86f9c5ebaf225;p=lyx.git

diff --git a/src/support/debug.h b/src/support/debug.h
index 34258073b9..b98dfd0eab 100644
--- 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();
@@ -201,6 +202,10 @@ LyXErr & operator<<(LyXErr &, int);
 LyXErr & operator<<(LyXErr &, unsigned int);
 LyXErr & operator<<(LyXErr &, long);
 LyXErr & operator<<(LyXErr &, unsigned long);
+#ifdef LYX_USE_LONG_LONG
+LyXErr & operator<<(LyXErr &, long long);
+LyXErr & operator<<(LyXErr &, unsigned long long);
+#endif
 LyXErr & operator<<(LyXErr &, double);
 LyXErr & operator<<(LyXErr &, std::string const &);
 LyXErr & operator<<(LyXErr &, docstring const &);