Initialize mutators later with STATIC_INIT_LATE

diff --git a/qcsrc/common/mutators/base.qh b/qcsrc/common/mutators/base.qh
index 4c39d6f7d5a4f32b46ef32e20fe90910a9b9eaee..d92bd5b57c90b43c60180a25c18a3af381a5c68b 100644 (file)
--- a/qcsrc/common/mutators/base.qh
+++ b/qcsrc/common/mutators/base.qh
@@ -228,6 +228,9 @@ STATIC_INIT(Mutators) {
     RegisterHooks();
     RegisterCallbacks();
     RegisterMutators();
+}
+
+STATIC_INIT_LATE(Mutators) {
     FOREACH(MUTATORS, it.mutatorcheck(), LAMBDA(Mutator_Add(it)));
 }
 

diff --git a/qcsrc/lib/Registry.qh b/qcsrc/lib/Registry.qh
index 8a93146d50911284925c19d4e2a40531be8e07a5..b9e2fd653b5622b61fce59be11fb5268eaf13818 100644 (file)
--- a/qcsrc/lib/Registry.qh
+++ b/qcsrc/lib/Registry.qh
@@ -25,13 +25,17 @@
     ACCUMULATE_FUNCTION(initfunc, Register_##ns##_##id)         \
     REGISTER_INIT(ns, id)
 
-void __static_init() { }
+void __static_init_early() { }
+void __static_init() { CALL_ACCUMULATED_FUNCTION(__static_init_early); }
 #define static_init() CALL_ACCUMULATED_FUNCTION(__static_init)
-#define REGISTER_REGISTRY(func) ACCUMULATE_FUNCTION(__static_init, func)
+#define REGISTER_REGISTRY(func) ACCUMULATE_FUNCTION(__static_init_early, func)
 
-#define STATIC_INIT(func) \
+#define _STATIC_INIT(where, func) \
     void _static_##func(); \
-    ACCUMULATE_FUNCTION(__static_init, _static_##func) \
+    ACCUMULATE_FUNCTION(where, _static_##func) \
     void _static_##func()
 
+#define STATIC_INIT(func)       _STATIC_INIT(__static_init_early,   func##_early)
+#define STATIC_INIT_LATE(func)  _STATIC_INIT(__static_init,         func)
+
 #endif