X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdebug.h;h=10bb5a7e87326d47042cee820ec3d0edc1f7aadc;hb=037b1e14789223c89e88e8bd74baffa4d0956571;hp=216538958d62c70af970541e927c9937c5351b7f;hpb=699a6db9fa168f91458a17d4f30c124e52a38054;p=lyx.git

diff --git a/src/support/debug.h b/src/support/debug.h
index 216538958d..10bb5a7e87 100644
--- a/src/support/debug.h
+++ b/src/support/debug.h
@@ -28,7 +28,7 @@ class ios_base;
 template<typename CharT, typename Traits> class basic_streambuf;
 typedef basic_streambuf<char, char_traits<char> > streambuf;
 
-}
+} // namespace std
 #endif
 
 
@@ -41,76 +41,76 @@ namespace Debug {
 		///
 		NONE = 0,
 		///
-		INFO       = (1 << 0),   // 1
+		INFO       = (1u << 0),   // 1
 		///
-		INIT       = (1 << 1),   // 2
+		INIT       = (1u << 1),   // 2
 		///
-		KEY        = (1 << 2),   // 4
+		KEY        = (1u << 2),   // 4
 		///
-		GUI        = (1 << 3),   // 8
+		GUI        = (1u << 3),   // 8
 		///
-		PARSER     = (1 << 4),   // 16
+		PARSER     = (1u << 4),   // 16
 		///
-		LYXRC      = (1 << 5),   // 32
+		LYXRC      = (1u << 5),   // 32
 		///
-		KBMAP      = (1 << 6),   // 64
+		KBMAP      = (1u << 6),   // 64
 		///
-		LATEX      = (1 << 7),   // 128
+		LATEX      = (1u << 7),   // 128
 		///
-		MATHED     = (1 << 8),   // 256 // Alejandro, please use this.
+		MATHED     = (1u << 8),   // 256 // Alejandro, please use this.
 		///
-		FONT       = (1 << 9),   // 512
+		FONT       = (1u << 9),   // 512
 		///
-		TCLASS     = (1 << 10),  // 1024
+		TCLASS     = (1u << 10),  // 1024
 		///
-		LYXVC      = (1 << 11),  // 2048
+		LYXVC      = (1u << 11),  // 2048
 		///
-		LYXSERVER  = (1 << 12),  // 4096
+		LYXSERVER  = (1u << 12),  // 4096
 		///
-		UNDO       = (1 << 13),  // 8192
+		UNDO       = (1u << 13),  // 8192
 		///
-		ACTION     = (1 << 14),   // 16384
+		ACTION     = (1u << 14),   // 16384
 		///
-		LYXLEX     = (1 << 15),
+		LYXLEX     = (1u << 15),
 		///
-		DEPEND     = (1 << 16),
+		DEPEND     = (1u << 16),
 		///
-		INSETS     = (1 << 17),
+		INSETS     = (1u << 17),
 		///
-		FILES      = (1 << 18),
+		FILES      = (1u << 18),
 		///
-		WORKAREA   = (1 << 19),
+		WORKAREA   = (1u << 19),
 		///
-		CLIPBOARD  = (1 << 20),
+		CLIPBOARD  = (1u << 20),
 		///
-		GRAPHICS   = (1 << 21),
+		GRAPHICS   = (1u << 21),
 		/// change tracking
-		CHANGES    = (1 << 22),
+		CHANGES    = (1u << 22),
 		///
-		EXTERNAL   = (1 << 23),
+		EXTERNAL   = (1u << 23),
 		///
-		PAINTING   = (1 << 24),
+		PAINTING   = (1u << 24),
 		///
-		SCROLLING  = (1 << 25),
+		SCROLLING  = (1u << 25),
 		///
-		MACROS     = (1 << 26),
+		MACROS     = (1u << 26),
 		///	rtl-related
-		RTL        = (1 << 27),
+		RTL        = (1u << 27),
 		///	locale related
-		LOCALE     = (1 << 28),
+		LOCALE     = (1u << 28),
 		///	selection
-		SELECTION  = (1 << 29),
+		SELECTION  = (1u << 29),
 		/// Find and Replace
-		FIND       = (1 << 30),
+		FIND       = (1u << 30),
 		///
-		DEBUG      = (1 << 31),
+		DEBUG      = (1u << 31),
 		///
 		ANY = 0xffffffff
 	};
 
 	/// Return number of levels
 	int levelCount();
- 
+
 	/// A function to convert debug level string names numerical values
 	Type value(std::string const & val);
 
@@ -144,7 +144,7 @@ class LyXErr
 public:
 	LyXErr(): dt_(Debug::NONE), stream_(0), enabled_(true),
 	          second_stream_(0), second_enabled_(false) {}
-	
+
 	/// Disable the stream completely
 	void disable();
 	/// Enable the stream after a possible call of disable()
@@ -165,7 +165,7 @@ public:
 	/// Returns second stream
 	std::ostream & secondStream() { return *second_stream_; }
 	/// Sets second stream
-	void setSecondStream(std::ostream * os) 
+	void setSecondStream(std::ostream * os)
 		{ second_enabled_ = (second_stream_ = os); }
 	/// Is the second stream is enabled?
 	bool secondEnabled() { return second_enabled_; }
@@ -202,6 +202,10 @@ LyXErr & operator<<(LyXErr &, int);
 LyXErr & operator<<(LyXErr &, unsigned int);
 LyXErr & operator<<(LyXErr &, long);
 LyXErr & operator<<(LyXErr &, unsigned long);
+#ifdef HAVE_LONG_LONG_INT
+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 &);
@@ -213,9 +217,8 @@ extern LyXErr lyxerr;
 
 } // namespace lyx
 
-#if USE_BOOST_CURRENT_FUNCTION
-#	include <boost/current_function.hpp>
-#	define CURRENT_POSITION BOOST_CURRENT_FUNCTION ": "
+#if USE__func__
+#	define CURRENT_POSITION __func__ ": "
 #else
 # define CURRENT_POSITION lyx::LyXErr::stripName(__FILE__) << " (" << __LINE__ << "): "
 #endif