From: Gunnar Beutner <gunnar@beutner.name>
Date: Wed, 18 Mar 2015 13:24:55 +0000 (+0100)
Subject: Fix initialization order for type objects
X-Git-Tag: v2.4.0~804
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05e55ab79d4fed822892c60387812856aeacd783;p=icinga2

Fix initialization order for type objects

refs #8791
---

diff --git a/lib/base/primitivetype.hpp b/lib/base/primitivetype.hpp
index e061a2468..93a5d88b1 100644
--- a/lib/base/primitivetype.hpp
+++ b/lib/base/primitivetype.hpp
@@ -54,7 +54,7 @@ private:
 			t->SetPrototype(prototype);				\
 			icinga::Type::Register(t);				\
 		}								\
-		INITIALIZE_ONCE(RegisterBuiltinType);				\
+		INITIALIZE_ONCE_WITH_PRIORITY(RegisterBuiltinType, 15);		\
 	} } }
 
 #define REGISTER_PRIMITIVE_TYPE(type, prototype)				\
@@ -66,7 +66,7 @@ private:
 			icinga::Type::Register(t);				\
 			type::TypeInstance = t;					\
 		}								\
-		INITIALIZE_ONCE(RegisterPrimitiveType);				\
+		INITIALIZE_ONCE_WITH_PRIORITY(RegisterPrimitiveType, 15);	\
 	} } }									\
 	DEFINE_TYPE_INSTANCE(type)