From c6a753b67e2b5348aa89be87e0070d6c4faaf644 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Fri, 12 Aug 2016 14:18:23 +0200 Subject: [PATCH] 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 443ebe87a..764fdbaf9 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 211eaa13d..ab6b10232 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_WITH_PRIORITY(RegisterTypeType, 20); String Type::ToString(void) const {