From 4f75649e4025f6af2730b0625b733a74944b02e7 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 18 Oct 2013 02:38:07 +0200 Subject: [PATCH 1/1] Simpler function accumulation. Thanks, graphitemaster. --- qcsrc/client/progs.src | 2 -- ...s-file-errors-scroll-up-and-fix-the-warnings.fteqccfail | 0 qcsrc/common/util.qh | 7 +++++++ qcsrc/menu/progs.src | 2 -- qcsrc/server/progs.src | 2 -- 5 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 qcsrc/common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src index 114f0a5b5c..fa61033f65 100644 --- a/qcsrc/client/progs.src +++ b/qcsrc/client/progs.src @@ -121,5 +121,3 @@ tturrets.qc player_skeleton.qc ../common/animdecide.qc - -../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail diff --git a/qcsrc/common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail b/qcsrc/common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index d575bbfddb..166af391e9 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -6,6 +6,12 @@ // a dummy macro that prevents the "hanging ;" warning #define ENDS_WITH_CURLY_BRACE +#ifdef GMQCC +# define ACCUMULATE_FUNCTION(func,otherfunc) \ + [[accumulate]] void func() { otherfunc(); } +# define CALL_ACCUMULATED_FUNCTION(func) \ + func() +#else #ifdef HAVE_YO_DAWG_CPP // TODO make ascii art pic of xzibit // YO DAWG! @@ -41,6 +47,7 @@ void ACCUMULATE_call(string func) # define CALL_ACCUMULATED_FUNCTION(func) \ ACCUMULATE_call(#func) #endif +#endif // used for simplifying ACCUMULATE_FUNCTIONs #define SET_FIRST_OR_LAST(input,first,count) if(!input) { input = (first + count); } diff --git a/qcsrc/menu/progs.src b/qcsrc/menu/progs.src index 3036278c1f..4900b9d96b 100644 --- a/qcsrc/menu/progs.src +++ b/qcsrc/menu/progs.src @@ -54,5 +54,3 @@ xonotic/util.qc ../common/urllib.qc ../warpzonelib/mathlib.qc - -../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src index e9e9a4b8c8..8980f77594 100644 --- a/qcsrc/server/progs.src +++ b/qcsrc/server/progs.src @@ -269,5 +269,3 @@ mutators/mutator_campcheck.qc ../common/test.qc ../common/util.qc ../common/notifications.qc - -../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail -- 2.39.2