]> granicus.if.org Git - icinga2/commitdiff
Fix initialization order for type objects
authorGunnar Beutner <gunnar@beutner.name>
Wed, 18 Mar 2015 13:24:55 +0000 (14:24 +0100)
committerGunnar Beutner <gunnar@beutner.name>
Wed, 18 Mar 2015 13:24:55 +0000 (14:24 +0100)
refs #8791

lib/base/primitivetype.hpp

index e061a24685dfb630571722d26b8398799069eeed..93a5d88b1b292fc21056da39f49f22da39b1349d 100644 (file)
@@ -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)