Remove no virtual dtor warnings, make MapgenParams contain actual NoiseParams

[minetest.git] / src / debug.cpp

diff --git a/src/debug.cpp b/src/debug.cpp
index a197913a964dfd229698ad332d63398885a9aa42..2e4992a78013f752ae51211db4d5d018cda11498 100644 (file)
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "debug.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <cstring>
 
 /*
        Debug output
@@ -129,7 +130,7 @@ void DebugStack::print(std::ostream &os, bool everything)
                os<<"Probably overflown."<<std::endl;
 }
 
-core::map<threadid_t, DebugStack*> g_debug_stacks;
+std::map<threadid_t, DebugStack*> g_debug_stacks;
 JMutex g_debug_stacks_mutex;
 
 void debug_stacks_init()
@@ -143,12 +144,11 @@ void debug_stacks_print_to(std::ostream &os)
 
        os<<"Debug stacks:"<<std::endl;
 
-       for(core::map<threadid_t, DebugStack*>::Iterator
-                       i = g_debug_stacks.getIterator();
-                       i.atEnd() == false; i++)
+       for(std::map<threadid_t, DebugStack*>::iterator
+                       i = g_debug_stacks.begin();
+                       i != g_debug_stacks.end(); ++i)
        {
-               DebugStack *stack = i.getNode()->getValue();
-               stack->print(os, false);
+               i->second->print(os, false);
        }
 }
 
@@ -158,11 +158,11 @@ void debug_stacks_print()
 
        DEBUGPRINT("Debug stacks:\n");
 
-       for(core::map<threadid_t, DebugStack*>::Iterator
-                       i = g_debug_stacks.getIterator();
-                       i.atEnd() == false; i++)
+       for(std::map<threadid_t, DebugStack*>::iterator
+                       i = g_debug_stacks.begin();
+                       i != g_debug_stacks.end(); ++i)
        {
-               DebugStack *stack = i.getNode()->getValue();
+               DebugStack *stack = i->second;
 
                for(int i=0; i<DEBUGSTREAM_COUNT; i++)
                {
@@ -178,18 +178,18 @@ DebugStacker::DebugStacker(const char *text)
 
        JMutexAutoLock lock(g_debug_stacks_mutex);
 
-       core::map<threadid_t, DebugStack*>::Node *n;
+       std::map<threadid_t, DebugStack*>::iterator n;
        n = g_debug_stacks.find(threadid);
-       if(n != NULL)
+       if(n != g_debug_stacks.end())
        {
-               m_stack = n->getValue();
+               m_stack = n->second;
        }
        else
        {
                /*DEBUGPRINT("Creating new debug stack for thread %x\n",
                                (unsigned int)threadid);*/
                m_stack = new DebugStack(threadid);
-               g_debug_stacks.insert(threadid, m_stack);
+               g_debug_stacks[threadid] = m_stack;
        }
 
        if(m_stack->stack_i >= DEBUG_STACK_SIZE)
@@ -223,7 +223,7 @@ DebugStacker::~DebugStacker()
                /*DEBUGPRINT("Deleting debug stack for thread %x\n",
                                (unsigned int)threadid);*/
                delete m_stack;
-               g_debug_stacks.remove(threadid);
+               g_debug_stacks.erase(threadid);
        }
 }