Fix samba related crashes

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

diff --git a/src/support/debug.cpp b/src/support/debug.cpp
index 03464284af04d987b8d097a87984fdeb0e0b1d20..0f2cd2dbf4d949181f4eb4f1a41cdd2a91129f1a 100644 (file)
--- a/src/support/debug.cpp
+++ b/src/support/debug.cpp
@@ -37,7 +37,7 @@ struct ErrorItem {
 
 
 ErrorItem errorTags[] = {
-       { Debug::NONE,      "none",      N_("No debugging message")},
+       { Debug::NONE,      "none",      N_("No debugging messages")},
        { Debug::INFO,      "info",      N_("General information")},
        { Debug::INIT,      "init",      N_("Program initialisation")},
        { Debug::KEY,       "key",       N_("Keyboard events handling")},
@@ -143,10 +143,10 @@ Debug::Type Debug::value(string const & val)
 void Debug::showLevel(ostream & os, Debug::Type level)
 {
        // Show what features are traced
-       for (int i = 0; i != numErrorTags; ++i) {
+       for (int i = 0; i < numErrorTags; ++i) {
                if (errorTags[i].level != Debug::ANY
-                   && errorTags[i].level != Debug::NONE
-                   && errorTags[i].level & level) {
+                     && errorTags[i].level != Debug::NONE
+                     && errorTags[i].level & level) {
                        // avoid to_utf8(_(...)) re-entrance problem
                        docstring const s = _(errorTags[i].desc);
                        os << to_utf8(bformat(_("Debugging `%1$s' (%2$s)"),
@@ -182,7 +182,7 @@ void LyXErr::enable()
 
 bool LyXErr::debugging(Debug::Type t) const
 {
-       return (dt & t);
+       return (dt_ & t);
 }
 
 
@@ -190,52 +190,53 @@ void LyXErr::endl()
 {
        if (enabled_) {
                stream() << std::endl;
-               if (second_used_)
-                       second() << "\n";
+               if (second_enabled_)
+                       secondStream() << std::endl;
        }
 }
 
 
 // It seems not possible to instantiate operator template out of class body
-#define STREAM_OPERATOR(t)     \
-{\
-       if (l.enabled()){\
-               l.stream() << t;\
-               if (l.second_used()){\
-                       l.second() << t;\
-                       ProgressInterface::instance()->lyxerrFlush();\
-               }\
-       }\
-       return l;\
+template<class T>
+LyXErr & toStream(LyXErr & l, T t)     
+{
+       if (l.enabled()){
+               l.stream() << t;
+                if (l.secondEnabled()) {
+                       l.secondStream() << t;
+                       ProgressInterface::instance()->lyxerrFlush();
+               }
+       }
+       return l;
 }
 
 
 LyXErr & operator<<(LyXErr & l, void const * t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, char const * t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, char t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, int t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, unsigned int t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, long t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, unsigned long t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, double t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, string const & t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, docstring const & t)
-STREAM_OPERATOR(to_utf8(t));
+{ return toStream(l, to_utf8(t)); }
 LyXErr & operator<<(LyXErr & l, FileName const & t)
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, ostream &(*t)(ostream &))
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, ios_base &(*t)(ios_base &))
-STREAM_OPERATOR(t)
+{ return toStream(l, t); }
 
 
 // The global instance