Merge branch 'master' into terencehill/bot_waypoints

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / accumulate.qh

diff --git a/qcsrc/lib/accumulate.qh b/qcsrc/lib/accumulate.qh
index a2f6714ec7b42d43c00824f2614f46359c2bcd68..2d1e40212fba3c9cd2d9f28216a5a3c2071c3d7e 100644 (file)
--- a/qcsrc/lib/accumulate.qh
+++ b/qcsrc/lib/accumulate.qh
@@ -1,9 +1,8 @@
-#ifndef ACCUMULATE_H
-#define ACCUMULATE_H
+#pragma once
 
 #ifdef QCC_SUPPORT_ACCUMULATE
        #define ACCUMULATE_FUNCTION(func, otherfunc) \
-               [[accumulate]] void func() \
+               ACCUMULATE void func() \
                { \
                        otherfunc(); \
                }
@@ -11,7 +10,6 @@
                func()
 #else
        #ifdef HAVE_YO_DAWG_CPP
-// TODO make ascii art pic of xzibit
 // YO DAWG!
 // I HERD YO LIEK MACROS
 // SO I PUT A MACRO DEFINITION IN YO MACRO DEFINITION
@@ -50,8 +48,9 @@
 #endif
 
 // used for simplifying ACCUMULATE_FUNCTIONs
-#define SET_FIRST_OR_LAST(input, first, count) if (!input) { input = (first + count); }
-#define SET_FIELD_COUNT(field, first, count) if (!field) { field = (first + count); ++count; }
-#define CHECK_MAX_COUNT(name, max, count, type) if (count > max) { error(strcat("Maximum ", type, " hit: ", #name, ": ", ftos(count), ".\n")); }
-
-#endif
+#define SET_FIRST_OR_LAST(input, first, count) \
+       if (!input) { input = (first + count); }
+#define SET_FIELD_COUNT(field, first, count) \
+       if (!field) { field = (first + count); ++count; }
+#define CHECK_MAX_COUNT(name, max, count, type) \
+       if (count > max) { error(strcat("Maximum ", type, " hit: ", #name, ": ", ftos(count), ".\n")); }