Remove redundant declarations reported by GCC with -Wredundant-decls option

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

diff --git a/src/support/debug.h b/src/support/debug.h
index 10bb5a7e87326d47042cee820ec3d0edc1f7aadc..f12a84223c9e3321e0206da803e71922f760ac4d 100644 (file)
--- a/src/support/debug.h
+++ b/src/support/debug.h
@@ -114,6 +114,10 @@ namespace Debug {
        /// A function to convert debug level string names numerical values
        Type value(std::string const & val);
 
+       /// Check the validity of debug level names
+       /// \return the first bad level name
+       std::string badValue(std::string const & val);
+
        /// A function to convert index of level to their numerical value
        Type value(int val);
 
@@ -168,7 +172,7 @@ public:
        void setSecondStream(std::ostream * os)
                { second_enabled_ = (second_stream_ = os); }
        /// Is the second stream is enabled?
-       bool secondEnabled() { return second_enabled_; }
+       bool secondEnabled() const { return second_enabled_; }
 
        /// Sets the debug level
        void setLevel(Debug::Type t) { dt_ = t; }
@@ -229,6 +233,18 @@ extern LyXErr lyxerr;
                else { lyx::lyxerr << CURRENT_POSITION << msg; lyx::lyxerr.endl(); } \
        } while (0)
 
+#define LYXERR_NOENDL(type, msg) \
+       do { \
+               if (!lyx::lyxerr.debugging(type)) {} \
+               else { lyx::lyxerr << CURRENT_POSITION << msg; } \
+       } while (0)
+
+#define LYXERR_NOPOS(type, msg) \
+       do { \
+               if (!lyx::lyxerr.debugging(type)) {} \
+               else { lyx::lyxerr << msg; lyx::lyxerr.endl(); } \
+       } while (0)
+
 #define LYXERR0(msg) \
        do { \
                lyx::lyxerr << CURRENT_POSITION << msg; lyx::lyxerr.endl(); \