[icinga-checkins] icinga.org: icinga2/master: Make sure base classes are registered in the right order

git at icinga.org git at icinga.org
Fri Aug 12 14:18:40 CEST 2016


Module: icinga2
Branch: master
Commit: 26f7aa805a135355ca670d5baa29b101cda7f429
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=26f7aa805a135355ca670d5baa29b101cda7f429

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Fri Aug 12 14:18:23 2016 +0200

Make sure base classes are registered in the right order

refs #12408

---

 lib/base/objecttype.cpp |    2 +-
 lib/base/type.cpp       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/base/objecttype.cpp b/lib/base/objecttype.cpp
index 443ebe8..764fdba 100644
--- a/lib/base/objecttype.cpp
+++ b/lib/base/objecttype.cpp
@@ -30,7 +30,7 @@ static void RegisterObjectType(void)
 	Object::TypeInstance = type;
 }
 
-INITIALIZE_ONCE(&RegisterObjectType);
+INITIALIZE_ONCE_WITH_PRIORITY(&RegisterObjectType, 20);
 
 ObjectType::ObjectType(void)
 { }
diff --git a/lib/base/type.cpp b/lib/base/type.cpp
index 211eaa1..f6e7592 100644
--- a/lib/base/type.cpp
+++ b/lib/base/type.cpp
@@ -32,7 +32,7 @@ static void RegisterTypeType(void)
 	Type::Register(type);
 }
 
-INITIALIZE_ONCE(RegisterTypeType);
+INITIALIZE_ONCE(RegisterTypeType, 20);
 
 String Type::ToString(void) const
 {



More information about the icinga-checkins mailing list