From 347a112aa1e279eed88883f2c2b9e3ad41c9d6d1 Mon Sep 17 00:00:00 2001 From: lethosor Date: Fri, 18 Dec 2015 17:45:23 -0500 Subject: [PATCH] Add support for 11-argument function wrappers Needed by item::addImprovementFromJob() as of 0.42: dfhack/df-structures@f6361e2 --- library/include/DataFuncs.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/library/include/DataFuncs.h b/library/include/DataFuncs.h index f34b9cc73..cd178263c 100644 --- a/library/include/DataFuncs.h +++ b/library/include/DataFuncs.h @@ -197,6 +197,13 @@ INSTANTIATE_WRAPPERS(10, (A1,A2,A3,A4,A5,A6,A7,A8,A9,A10), #define FW_TARGS class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9, class A10, class A11 INSTANTIATE_RETURN_TYPE((A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)) +INSTANTIATE_WRAPPERS(11, (A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11), + (OSTREAM_ARG,A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11), + (vA1,vA2,vA3,vA4,vA5,vA6,vA7,vA8,vA9,vA10,vA11), + (out,vA1,vA2,vA3,vA4,vA5,vA6,vA7,vA8,vA9,vA10,vA11), + LOAD_ARG(A1); LOAD_ARG(A2); LOAD_ARG(A3); LOAD_ARG(A4); + LOAD_ARG(A5); LOAD_ARG(A6); LOAD_ARG(A7); LOAD_ARG(A8); + LOAD_ARG(A9); LOAD_ARG(A10); LOAD_ARG(A11);) #undef FW_TARGS #undef FW_TARGSC @@ -227,4 +234,4 @@ INSTANTIATE_RETURN_TYPE((A1,A2,A3,A4,A5,A6,A7,A8,A9,A10,A11)) // bah, but didn't have any idea how to allocate statically return new function_identity(ptr, vararg); } -} \ No newline at end of file +}