Fix merge mistake when rebasing for PR #1169

[minetest.git] / src / database-dummy.cpp

diff --git a/src/database-dummy.cpp b/src/database-dummy.cpp
index 7a36a8944544b0d7f7edfe2001fdf835d173e996..c4794d281a282330f1e8ba2e55eb3199396e7678 100644 (file)
--- a/src/database-dummy.cpp
+++ b/src/database-dummy.cpp
@@ -1,26 +1,36 @@
+/*
+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 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 Lesser General Public License for more details.
+
+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.
+*/
+
 /*
 Dummy "database" class
 */
 
 
+#include "database-dummy.h"
+
 #include "map.h"
 #include "mapsector.h"
 #include "mapblock.h"
+#include "serialization.h"
 #include "main.h"
-#include "filesys.h"
-#include "voxel.h"
-#include "porting.h"
-#include "mapgen.h"
-#include "nodemetadata.h"
 #include "settings.h"
 #include "log.h"
-#include "profiler.h"
-#include "nodedef.h"
-#include "gamedef.h"
-#include "util/directiontables.h"
-#include "rollback_interface.h"
-
-#include "database-dummy.h"
 
 Database_Dummy::Database_Dummy(ServerMap *map)
 {
@@ -139,9 +149,9 @@ MapBlock* Database_Dummy::loadBlock(v3s16 blockpos)
        return(NULL);
 }
 
-void Database_Dummy::listAllLoadableBlocks(core::list<v3s16> &dst)
+void Database_Dummy::listAllLoadableBlocks(std::list<v3s16> &dst)
 {
-       for(std::map<unsigned long long, std::string>::iterator x = m_database.begin(); x != m_database.end(); ++x)
+       for(std::map<u64, std::string>::iterator x = m_database.begin(); x != m_database.end(); ++x)
        {
                v3s16 p = getIntegerAsBlock(x->first);
                //dstream<<"block_i="<<block_i<<" p="<<PP(p)<<std::endl;