Remove ClientMap::m_camera_mutex

[minetest.git] / src / log.cpp

diff --git a/src/log.cpp b/src/log.cpp
index 7cae8b67072a18c119a09e6b2d6fc94ff89d6989..600e715c12680653379b935551aa2e48384bbffe 100644 (file)
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -135,7 +135,8 @@ class AndroidSystemLogOutput : public ICombinedLogOutput {
                }
                void logRaw(LogLevel lev, const std::string &line)
                {
-                       assert(ARRLEN(g_level_to_android) == LL_MAX);
+                       STATIC_ASSERT(ARRLEN(g_level_to_android) == LL_MAX,
+                               mismatch_between_android_and_internal_loglevels);
                        __android_log_print(g_level_to_android[lev],
                                PROJECT_NAME_C, "%s", line.c_str());
                }
@@ -172,7 +173,7 @@ LogLevel Logger::stringToLevel(const std::string &name)
 
 void Logger::addOutput(ILogOutput *out)
 {
-       addOutputMaxLevel(out, LL_MAX);
+       addOutputMaxLevel(out, (LogLevel)(LL_MAX - 1));
 }
 
 void Logger::addOutput(ILogOutput *out, LogLevel lev)
@@ -180,21 +181,34 @@ void Logger::addOutput(ILogOutput *out, LogLevel lev)
        m_outputs[lev].push_back(out);
 }
 
+void Logger::addOutputMasked(ILogOutput *out, LogLevelMask mask)
+{
+       for (size_t i = 0; i < LL_MAX; i++) {
+               if (mask & LOGLEVEL_TO_MASKLEVEL(i))
+                       m_outputs[i].push_back(out);
+       }
+}
+
 void Logger::addOutputMaxLevel(ILogOutput *out, LogLevel lev)
 {
+       assert(lev < LL_MAX);
        for (size_t i = 0; i <= lev; i++)
                m_outputs[i].push_back(out);
 }
 
-void Logger::removeOutput(ILogOutput *out)
+LogLevelMask Logger::removeOutput(ILogOutput *out)
 {
+       LogLevelMask ret_mask = 0;
        for (size_t i = 0; i < LL_MAX; i++) {
                std::vector<ILogOutput *>::iterator it;
 
                it = std::find(m_outputs[i].begin(), m_outputs[i].end(), out);
-               if (it != m_outputs[i].end())
+               if (it != m_outputs[i].end()) {
+                       ret_mask |= LOGLEVEL_TO_MASKLEVEL(i);
                        m_outputs[i].erase(it);
+               }
        }
+       return ret_mask;
 }
 
 void Logger::setLevelSilenced(LogLevel lev, bool silenced)
@@ -227,7 +241,8 @@ const std::string Logger::getLevelLabel(LogLevel lev)
                "VERBOSE",
        };
        assert(lev < LL_MAX && lev >= 0);
-       assert(ARRLEN(names) == LL_MAX);
+       STATIC_ASSERT(ARRLEN(names) == LL_MAX,
+               mismatch_between_loglevel_names_and_enum);
        return names[lev];
 }