Now that exceptions are allowed, handle gracefully the case where a Buffer temp direc...

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

diff --git a/src/support/debug.cpp b/src/support/debug.cpp
index b90eaf69a296dbf29a0d04141b5ddc5e10621ab1..21f2dea3a085720fa481c2aba7fd5f3d00d56df5 100644 (file)
--- a/src/support/debug.cpp
+++ b/src/support/debug.cpp
@@ -21,17 +21,11 @@
 #include <iostream>
 #include <iomanip>
 
-using std::setw;
-using std::string;
-using std::ostream;
-
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::ascii_lowercase;
-using support::bformat;
-using support::isStrInt;
-
 namespace {
 
 struct ErrorItem {
@@ -153,36 +147,37 @@ bool LyXErr::debugging(Debug::Type t) const
 
 void LyXErr::endl()
 {
-       stream() << std::endl;
+       if (enabled_)
+               stream() << std::endl;
 }
 
 
 LyXErr & operator<<(LyXErr & l, void const * t)
-{ l.stream() << t; return l; }
+{ if (l.enabled()) l.stream() << t; return l; }
 LyXErr & operator<<(LyXErr & l, char const * t)
-{ l.stream() << t; return l; }
+{ if (l.enabled()) l.stream() << t; return l; }
 LyXErr & operator<<(LyXErr & l, char t)
-{ l.stream() << t; return l; }
+{ if (l.enabled()) l.stream() << t; return l; }
 LyXErr & operator<<(LyXErr & l, int t)
-{ l.stream() << t; return l; }
+{ if (l.enabled()) l.stream() << t; return l; }
 LyXErr & operator<<(LyXErr & l, unsigned int t)
-{ l.stream() << t; return l; }
+{ if (l.enabled()) l.stream() << t; return l; }
 LyXErr & operator<<(LyXErr & l, long t)
-{ l.stream() << t; return l; }
+{ if (l.enabled()) l.stream() << t; return l; }
 LyXErr & operator<<(LyXErr & l, unsigned long t)
-{ l.stream() << t; return l; }
+{ if (l.enabled()) l.stream() << t; return l; }
 LyXErr & operator<<(LyXErr & l, double t)
-{ l.stream() << t; return l; }
-LyXErr & operator<<(LyXErr & l, std::string const & t)
-{ l.stream() << t; return l; }
+{ if (l.enabled()) l.stream() << t; return l; }
+LyXErr & operator<<(LyXErr & l, string const & t)
+{ if (l.enabled()) l.stream() << t; return l; }
 LyXErr & operator<<(LyXErr & l, docstring const & t)
-{ l.stream() << to_utf8(t); return l; }
-LyXErr & operator<<(LyXErr & l, support::FileName const & t)
-{ l.stream() << t; return l; }
-LyXErr & operator<<(LyXErr & l, std::ostream &(*t)(std::ostream &))
-{ l.stream() << t; return l; }
-LyXErr & operator<<(LyXErr & l, std::ios_base &(*t)(std::ios_base &))
-{ l.stream() << t; return l; }
+{ if (l.enabled()) l.stream() << to_utf8(t); return l; }
+LyXErr & operator<<(LyXErr & l, FileName const & t)
+{ if (l.enabled()) l.stream() << t; return l; }
+LyXErr & operator<<(LyXErr & l, ostream &(*t)(ostream &))
+{ if (l.enabled()) l.stream() << t; return l; }
+LyXErr & operator<<(LyXErr & l, ios_base &(*t)(ios_base &))
+{ if (l.enabled()) l.stream() << t; return l; }
 
 
 // The global instance