Avoid clash between function name and structure initializer in C++

doc/doxygen/chapters/api/insert_task.doxy

@@ -193,18 +193,18 @@ Instead of calling starpu_codelet_pack_args(), one can also call
 starpu_codelet_pack_arg_init(), then starpu_codelet_pack_arg() for each
 data, then starpu_codelet_pack_arg_fini().
 
-\fn void starpu_codelet_pack_arg_init(struct starpu_codelet_pack_arg *state)
+\fn void starpu_codelet_pack_arg_init(struct starpu_codelet_pack_arg_data *state)
 \ingroup API_Insert_Task
 Initiaze struct starpu_codelet_pack_arg before calling starpu_codelet_pack_arg and
 starpu_codelet_pack_arg_fini. This will simply initialize the content of the structure.
 
-\fn void starpu_codelet_pack_arg(struct starpu_codelet_pack_arg *state, void *ptr, size_t ptr_size)
+\fn void starpu_codelet_pack_arg(struct starpu_codelet_pack_arg_data *state, void *ptr, size_t ptr_size)
 Pack one argument into struct starpu_codelet_pack_arg state. That structure
 has to be initialized before with starpu_codelet_pack_arg_init, and after all
 starpu_codelet_pack_arg calls performed, starpu_codelet_pack_arg_fini has to be
 used to get the cl_arg and cl_arg_size to be put in the task.
 
-\fn void starpu_codelet_pack_arg_fini(struct starpu_codelet_pack_arg *state, void **cl_arg, size_t *cl_arg_size)
+\fn void starpu_codelet_pack_arg_fini(struct starpu_codelet_pack_arg_data *state, void **cl_arg, size_t *cl_arg_size)
 \ingroup API_Insert_Task
 Finish packing data, after calling starpu_codelet_pack_arg_init once and starpu_codelet_pack_arg several times.
 

include/starpu_task_util.h

@@ -77,16 +77,16 @@ void starpu_task_insert_data_process_mode_array_arg(struct starpu_codelet *cl, s
 
 void starpu_codelet_pack_args(void **arg_buffer, size_t *arg_buffer_size, ...);
 
-struct starpu_codelet_pack_arg {
+struct starpu_codelet_pack_arg_data {
 	char *arg_buffer;
 	size_t arg_buffer_size;
 	size_t current_offset;
 	int nargs;
 };
 
-void starpu_codelet_pack_arg_init(struct starpu_codelet_pack_arg *state);
-void starpu_codelet_pack_arg(struct starpu_codelet_pack_arg *state, const void *ptr, size_t ptr_size);
-void starpu_codelet_pack_arg_fini(struct starpu_codelet_pack_arg *state, void **cl_arg, size_t *cl_arg_size);
+void starpu_codelet_pack_arg_init(struct starpu_codelet_pack_arg_data *state);
+void starpu_codelet_pack_arg(struct starpu_codelet_pack_arg_data *state, const void *ptr, size_t ptr_size);
+void starpu_codelet_pack_arg_fini(struct starpu_codelet_pack_arg_data *state, void **cl_arg, size_t *cl_arg_size);
 
 void starpu_codelet_unpack_args(void *cl_arg, ...);
 void starpu_codelet_unpack_args_and_copyleft(void *cl_arg, void *buffer, size_t buffer_size, ...);

src/util/starpu_task_insert_utils.c

@@ -21,7 +21,7 @@
 #include <common/utils.h>
 #include <core/task.h>
 
-void starpu_codelet_pack_arg_init(struct starpu_codelet_pack_arg *state)
+void starpu_codelet_pack_arg_init(struct starpu_codelet_pack_arg_data *state)
 {
 	state->arg_buffer = NULL;
 	state->arg_buffer_size = 0;
@@ -29,7 +29,7 @@ void starpu_codelet_pack_arg_init(struct starpu_codelet_pack_arg *state)
 	state->nargs = 0;
 }
 
-void starpu_codelet_pack_arg(struct starpu_codelet_pack_arg *state, const void *ptr, size_t ptr_size)
+void starpu_codelet_pack_arg(struct starpu_codelet_pack_arg_data *state, const void *ptr, size_t ptr_size)
 {
 	STARPU_ASSERT_MSG(state->current_offset >= sizeof(int), "struct starpu_codelet_pack_arg has to be initialized with starpu_codelet_pack_arg_init");
 	if (state->current_offset + sizeof(ptr_size) + ptr_size > state->arg_buffer_size)
@@ -49,7 +49,7 @@ void starpu_codelet_pack_arg(struct starpu_codelet_pack_arg *state, const void *
 	state->nargs++;
 }
 
-void starpu_codelet_pack_arg_fini(struct starpu_codelet_pack_arg *state, void **cl_arg, size_t *cl_arg_size)
+void starpu_codelet_pack_arg_fini(struct starpu_codelet_pack_arg_data *state, void **cl_arg, size_t *cl_arg_size)
 {
 	if (state->nargs)
 	{
@@ -69,7 +69,7 @@ int _starpu_codelet_pack_args(void **arg_buffer, size_t *arg_buffer_size, va_lis
 {
 	int arg_type;
 
-	struct starpu_codelet_pack_arg state;
+	struct starpu_codelet_pack_arg_data state;
 	starpu_codelet_pack_arg_init(&state);
 
 	while((arg_type = va_arg(varg_list, int)) != 0)
@@ -328,7 +328,7 @@ int _starpu_task_insert_create(struct starpu_codelet *cl, struct starpu_task *ta
 	task->cl = cl;
 	current_buffer = 0;
 
-	struct starpu_codelet_pack_arg state;
+	struct starpu_codelet_pack_arg_data state;
 	starpu_codelet_pack_arg_init(&state);
 
 	while((arg_type = va_arg(varg_list, int)) != 0)
@@ -528,7 +528,7 @@ int _fstarpu_task_insert_create(struct starpu_codelet *cl, struct starpu_task *t
 
 	_STARPU_TRACE_TASK_BUILD_START();
 
-	struct starpu_codelet_pack_arg state;
+	struct starpu_codelet_pack_arg_data state;
 	starpu_codelet_pack_arg_init(&state);
 
 	task->cl = cl;