@@ -115,7 +115,10 @@ using TaskFunction8 = void( * )( void*, void*, void*, void*, void*, void*, void*
115115#define argsMsg " Tasks must have the same amount of args as the underlying function;" \
116116 " each function arg must be a pointer to the corresponding task arg type"
117117
118- #define argSizeMsg " Task arg size must not exceed Task::maxArgSize"
118+ #define argSizeMsg " Task arg 1 size must not exceed Task::maxArgSize"
119+ #define arg2SizeMsg " Task arg 2 size must not exceed Task::maxArgSize"
120+ #define arg3SizeMsg " Task arg 3 size must not exceed Task::maxArgSize"
121+ #define arg4SizeMsg " Task arg 4 size must not exceed Task::maxArgSize"
119122// char[] = "ALongTaskNameToBeSure?";
120123
121124struct Task {
@@ -198,8 +201,8 @@ struct Task {
198201 Execute ( ( TaskFunction ) func ) {
199202
200203 static_assert ( std::is_same_v<FuncType, void ( * )( DataType*, DataType2* )>, argsMsg );
201- static_assert ( sizeof ( DataType ) <= maxArgSize, argSizeMsg );
202- static_assert ( sizeof ( DataType2 ) <= maxArgSize, argSizeMsg );
204+ static_assert ( sizeof ( DataType ) <= maxArgSize, argSizeMsg );
205+ static_assert ( sizeof ( DataType2 ) <= maxArgSize, arg2SizeMsg );
203206
204207 Arg args[] {
205208 Arg {
@@ -224,9 +227,9 @@ struct Task {
224227 Execute ( ( TaskFunction ) func ) {
225228
226229 static_assert ( std::is_same_v<FuncType, void ( * )( DataType*, DataType2*, DataType3* )>, argsMsg );
227- static_assert ( sizeof ( DataType ) <= maxArgSize, argSizeMsg );
228- static_assert ( sizeof ( DataType2 ) <= maxArgSize, argSizeMsg );
229- static_assert ( sizeof ( DataType3 ) <= maxArgSize, argSizeMsg );
230+ static_assert ( sizeof ( DataType ) <= maxArgSize, argSizeMsg );
231+ static_assert ( sizeof ( DataType2 ) <= maxArgSize, arg2SizeMsg );
232+ static_assert ( sizeof ( DataType3 ) <= maxArgSize, arg3SizeMsg );
230233
231234 Arg args[] {
232235 Arg {
@@ -257,10 +260,10 @@ struct Task {
257260 Execute ( ( TaskFunction ) func ) {
258261
259262 static_assert ( std::is_same_v<FuncType, void ( * )( DataType*, DataType2*, DataType3*, DataType4* )>, argsMsg );
260- static_assert ( sizeof ( DataType ) <= maxArgSize, argSizeMsg );
261- static_assert ( sizeof ( DataType2 ) <= maxArgSize, argSizeMsg );
262- static_assert ( sizeof ( DataType3 ) <= maxArgSize, argSizeMsg );
263- static_assert ( sizeof ( DataType4 ) <= maxArgSize, argSizeMsg );
263+ static_assert ( sizeof ( DataType ) <= maxArgSize, argSizeMsg );
264+ static_assert ( sizeof ( DataType2 ) <= maxArgSize, arg2SizeMsg );
265+ static_assert ( sizeof ( DataType3 ) <= maxArgSize, arg3SizeMsg );
266+ static_assert ( sizeof ( DataType4 ) <= maxArgSize, arg4SizeMsg );
264267
265268 Arg args[] {
266269 Arg {
0 commit comments