make ret variable in /builtin/mainmenu/tab_credits.lua local (#5942)

[minetest.git] / src / ban.h

diff --git a/src/ban.h b/src/ban.h
index 02a472f51c825bab81fd9536a317d98459b88f7a..7c88406d48e79462f13380ffc9a22c610738b4c3 100644 (file)
--- a/src/ban.h
+++ b/src/ban.h
@@ -20,11 +20,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef BAN_HEADER
 #define BAN_HEADER
 
+#include "util/string.h"
+#include "threading/thread.h"
+#include "exceptions.h"
 #include <map>
 #include <string>
-#include "jthread/jthread.h"
-#include "jthread/jmutex.h"
-#include "exceptions.h"
+#include <mutex>
 
 class BanManager
 {
@@ -40,12 +41,12 @@ class BanManager
        void add(const std::string &ip, const std::string &name);
        void remove(const std::string &ip_or_name);
        bool isModified();
+
 private:
-       JMutex m_mutex;
+       std::mutex m_mutex;
        std::string m_banfilepath;
-       std::map<std::string, std::string> m_ips;
+       StringMap m_ips;
        bool m_modified;
-
 };
 
 #endif