X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Flib%2Farraylist.qh;fp=qcsrc%2Flib%2Farraylist.qh;h=a10dcaa7b919b0c60299393c715bdfb6d1130b5f;hb=ca2b4af3846cb6e38d166006cc3b32c89cf99142;hp=18305177bf8a266261e1be9ad143dfde695fcace;hpb=f53ede36a1898c157e840c96ffac2534ab3c8e31;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/lib/arraylist.qh b/qcsrc/lib/arraylist.qh index 18305177b..a10dcaa7b 100644 --- a/qcsrc/lib/arraylist.qh +++ b/qcsrc/lib/arraylist.qh @@ -6,7 +6,6 @@ USING(ArrayList, entity); #define AL_NEW(this, n, default, T) \ MACRO_BEGIN \ - { \ ArrayList _al = this = new_pure(ArrayList); \ _al.al_buf = buf_create(); \ for (int i = 0, _n = _al.al_len = n; i < _n; ++i) \ @@ -14,15 +13,14 @@ USING(ArrayList, entity); const _AL_type__##T() it = default; \ AL_set##T(this, i, it); \ } \ - } MACRO_END + MACRO_END #define AL_DELETE(this) \ MACRO_BEGIN \ - { \ buf_del(this.al_buf); \ delete(this); \ this = NULL; \ - } MACRO_END + MACRO_END #define _AL_type__s() string #define AL_gets(this, idx) bufstr_get(this.al_buf, idx) @@ -60,11 +58,10 @@ entity al_ftoe(int i) = #80; #define AL_EACH(this, T, cond, body) \ MACRO_BEGIN \ - { \ const noref ArrayList _al = this; \ for (int i = 0, n = _al.al_len; i < n; ++i) \ { \ const noref _AL_type__##T() it = AL_get##T(_al, i); \ if (cond) { body } \ } \ - } MACRO_END + MACRO_END