Fix --color command line parameter ignorance (#7173)

[oweals/minetest.git] / src / profiler.h

diff --git a/src/profiler.h b/src/profiler.h
index 2d70e8af4fb3efc058c49878b32221234e14b3c5..6704afd514f96908920b4ea7f47b5e563efa00c0 100644 (file)
--- a/src/profiler.h
+++ b/src/profiler.h
@@ -17,17 +17,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef PROFILER_HEADER
-#define PROFILER_HEADER
+#pragma once
 
 #include "irrlichttypes.h"
+#include <cassert>
 #include <string>
 #include <map>
+#include <ostream>
 
 #include "threading/mutex_auto_lock.h"
 #include "util/timetaker.h"
 #include "util/numeric.h"      // paging()
-#include "debug.h"             // assert()
 
 #define MAX_PROFILER_TEXT_ROWS 20
 
@@ -42,9 +42,7 @@ extern Profiler *g_profiler;
 class Profiler
 {
 public:
-       Profiler()
-       {
-       }
+       Profiler() = default;
 
        void add(const std::string &name, float value)
        {
@@ -82,11 +80,8 @@ public:
        void clear()
        {
                MutexAutoLock lock(m_mutex);
-               for(std::map<std::string, float>::iterator
-                               i = m_data.begin();
-                               i != m_data.end(); ++i)
-               {
-                       i->second = 0;
+               for (auto &it : m_data) {
+                       it.second = 0;
                }
                m_avgcounts.clear();
        }
@@ -195,11 +190,8 @@ public:
                        ScopeProfilerType type = SPT_ADD);
        ~ScopeProfiler();
 private:
-       Profiler *m_profiler;
+       Profiler *m_profiler = nullptr;
        std::string m_name;
-       TimeTaker *m_timer;
+       TimeTaker *m_timer = nullptr;
        enum ScopeProfilerType m_type;
 };
-
-#endif
-