X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fregistry.qh;h=d8f18a02c96e4ab98b749530dd5f1f58550609b5;hb=52cdd440f6cfdc9544099ac68455e5361ace00d2;hp=2d41e5d431b3ba9c7b63ccbb87268a4b96615267;hpb=ab81399268cbd4888884bcd1f4db6c3bf9bd0ae3;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/lib/registry.qh b/qcsrc/lib/registry.qh index 2d41e5d43..d8f18a02c 100644 --- a/qcsrc/lib/registry.qh +++ b/qcsrc/lib/registry.qh @@ -22,9 +22,9 @@ */ #define REGISTRY(id, max) \ void Register##id(); \ - [[accumulate]] void REGISTRY_DEPENDS_(id) {} \ - [[accumulate]] REGISTRY_BEGIN(id) {} \ - [[accumulate]] REGISTRY_END(id) {} \ + ACCUMULATE void REGISTRY_DEPENDS_(id) {} \ + REGISTRY_BEGIN(id) {} \ + REGISTRY_END(id) {} \ void _Register##id() {} \ int id##_state = 0; \ void Register##id() { if (id##_state) return; id##_state = 1; REGISTRY_DEPENDS_(id); REGISTRY_BEGIN_(id); _Register##id(); id##_state = 2; REGISTRY_END_(id); } \ @@ -40,11 +40,11 @@ #define REGISTRY_DEPENDS_(id) Register##id##_Depends() /** Called before initializing a registry. */ -#define REGISTRY_BEGIN(id) [[accumulate]] void REGISTRY_BEGIN_(id) { noref void() f = Register##id; } void REGISTRY_BEGIN_(id) +#define REGISTRY_BEGIN(id) ACCUMULATE void REGISTRY_BEGIN_(id) { noref void() f = Register##id; } void REGISTRY_BEGIN_(id) #define REGISTRY_BEGIN_(id) Register##id##_First() /** Called after initializing a registry. */ -#define REGISTRY_END(id) [[accumulate]] void REGISTRY_END_(id) { noref void() f = Register##id; } void REGISTRY_END_(id) +#define REGISTRY_END(id) ACCUMULATE void REGISTRY_END_(id) { noref void() f = Register##id; } void REGISTRY_END_(id) #define REGISTRY_END_(id) Register##id##_Done() REGISTRY(Registries, BITS(8)) @@ -104,7 +104,7 @@ REGISTRY(Registries, BITS(8)) REGISTRY_PUSH(registry, fld, e); \ } MACRO_END -#define REGISTER_INIT(id) [[accumulate]] void Register_##id##_init(entity this) +#define REGISTER_INIT(id) ACCUMULATE void Register_##id##_init(entity this) /** internal next pointer */ #define REGISTRY_NEXT enemy @@ -147,9 +147,9 @@ REGISTRY(Registries, BITS(8)) #define REGISTRY_HASH(id) Registry_hash_##id ERASEABLE -[[accumulate]] void Registry_check(string r, string server) { } +ACCUMULATE void Registry_check(string r, string server) { } ERASEABLE -[[accumulate]] void Registry_send_all() { } +ACCUMULATE void Registry_send_all() { } #ifdef SVQC void Registry_send(string id, string hash);