From 8b8ef8acc0cc0b59e231d55e7857f629fee27e66 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Thu, 1 Dec 2011 01:58:31 +0200
Subject: Move NodeMetadata prototype containers to content_nodemeta.cpp to fix
 them not being filled correctly on some systems and compilers

---
 src/content_nodemeta.cpp | 3 +++
 src/nodemetadata.cpp     | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index 064194186..8666051a4 100644
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -32,6 +32,9 @@ class Inventory;
 #define NODEMETA_FURNACE 16
 #define NODEMETA_LOCKABLE_CHEST 17
 
+core::map<u16, NodeMetadata::Factory> NodeMetadata::m_types;
+core::map<std::string, NodeMetadata::Factory2> NodeMetadata::m_names;
+
 class SignNodeMetadata : public NodeMetadata
 {
 public:
diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp
index 7abf82426..410b4e2ea 100644
--- a/src/nodemetadata.cpp
+++ b/src/nodemetadata.cpp
@@ -30,9 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	NodeMetadata
 */
 
-core::map<u16, NodeMetadata::Factory> NodeMetadata::m_types;
-core::map<std::string, NodeMetadata::Factory2> NodeMetadata::m_names;
-
 NodeMetadata::NodeMetadata(IGameDef *gamedef):
 	m_gamedef(gamedef)
 {
-- 
cgit v1.2.3