Fix Mapgen Valleys getSpawnLevelAtPoint() (#7756)

[minetest.git] / src / util / container.h

diff --git a/src/util/container.h b/src/util/container.h
index af85d80e39ba83151cac3766c17f602d4dfd6f08..2ad2bbfc740362da4447b9ae6293c82d416e0c6d 100644 (file)
--- a/src/util/container.h
+++ b/src/util/container.h
@@ -19,10 +19,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
-#include "../irrlichttypes.h"
-#include "../exceptions.h"
-#include "../threading/mutex_auto_lock.h"
-#include "../threading/semaphore.h"
+#include "irrlichttypes.h"
+#include "exceptions.h"
+#include "threading/mutex_auto_lock.h"
+#include "threading/semaphore.h"
 #include <list>
 #include <vector>
 #include <map>
@@ -79,7 +79,7 @@ template<typename Key, typename Value>
 class MutexedMap
 {
 public:
-       MutexedMap() {}
+       MutexedMap() = default;
 
        void set(const Key &name, const Value &value)
        {
@@ -128,7 +128,8 @@ class MutexedQueue
        template<typename Key, typename U, typename Caller, typename CallerData>
        friend class RequestQueue;
 
-       MutexedQueue() {}
+       MutexedQueue() = default;
+
        bool empty() const
        {
                MutexAutoLock lock(m_mutex);
@@ -153,9 +154,9 @@ class MutexedQueue
                        T t = m_queue.front();
                        m_queue.pop_front();
                        return t;
-               } else {
-                       return T();
                }
+
+               return T();
        }
 
        T pop_front(u32 wait_time_max_ms)
@@ -166,9 +167,9 @@ class MutexedQueue
                        T t = m_queue.front();
                        m_queue.pop_front();
                        return t;
-               } else {
-                       throw ItemNotFoundException("MutexedQueue: queue is empty");
                }
+
+               throw ItemNotFoundException("MutexedQueue: queue is empty");
        }
 
        T pop_frontNoEx()
@@ -190,9 +191,9 @@ class MutexedQueue
                        T t = m_queue.back();
                        m_queue.pop_back();
                        return t;
-               } else {
-                       throw ItemNotFoundException("MutexedQueue: queue is empty");
                }
+
+               throw ItemNotFoundException("MutexedQueue: queue is empty");
        }
 
        /* this version of pop_back returns a empty element of T on timeout.
@@ -206,9 +207,9 @@ class MutexedQueue
                        T t = m_queue.back();
                        m_queue.pop_back();
                        return t;
-               } else {
-                       return T();
                }
+
+               return T();
        }
 
        T pop_backNoEx()