Merge remote branch 'origin/master'

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

diff --git a/src/serverobject.h b/src/serverobject.h
index c5ae6aa8ee673533d0ca040becd7eef9e20e7b62..7a5b47bd16f671ecf95e43d38c75ee789f482c4a 100644 (file)
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-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
@@ -235,7 +235,7 @@ protected:
 
 private:
        // Used for creating objects based on type
-       static core::map<u16, Factory> m_types;
+       static std::map<u16, Factory> m_types;
 };
 
 #endif