Loading ifs/scripts/patches/abt_io_cplusplus_template_clash.patchdeleted 100644 → 0 +0 −70 Original line number Diff line number Diff line diff --git a/include/abt-io.h b/include/abt-io.h index 54c3ed6..7e5c71d 100644 --- a/include/abt-io.h +++ b/include/abt-io.h @@ -114,14 +114,14 @@ abt_io_op_t* abt_io_pread_nb( /** * wrapper for mkostemp() */ -int abt_io_mkostemp(abt_io_instance_id aid, char *template, int flags); +int abt_io_mkostemp(abt_io_instance_id aid, char *tpl, int flags); /** * non-blocking wrapper for mkostemp() */ abt_io_op_t* abt_io_mkostemp_nb( abt_io_instance_id aid, - char *template, + char *tpl, int flags, int *ret); diff --git a/src/abt-io.c b/src/abt-io.c index f612dc9..87d3508 100644 --- a/src/abt-io.c +++ b/src/abt-io.c @@ -401,7 +401,7 @@ static void abt_io_mkostemp_fn(void *foo) return; } -static int issue_mkostemp(ABT_pool pool, abt_io_op_t *op, char* template, int flags, int *ret) +static int issue_mkostemp(ABT_pool pool, abt_io_op_t *op, char* tpl, int flags, int *ret) { struct abt_io_mkostemp_state state; struct abt_io_mkostemp_state *pstate = NULL; @@ -416,7 +416,7 @@ static int issue_mkostemp(ABT_pool pool, abt_io_op_t *op, char* template, int fl *ret = -ENOSYS; pstate->ret = ret; - pstate->template = template; + pstate->template = tpl; pstate->flags = flags; pstate->eventual = NULL; rc = ABT_eventual_create(0, &pstate->eventual); @@ -445,14 +445,14 @@ err: return -1; } -int abt_io_mkostemp(abt_io_instance_id aid, char *template, int flags) +int abt_io_mkostemp(abt_io_instance_id aid, char *tpl, int flags) { int ret = -1; - issue_mkostemp(aid->progress_pool, NULL, template, flags, &ret); + issue_mkostemp(aid->progress_pool, NULL, tpl, flags, &ret); return ret; } -abt_io_op_t* abt_io_mkostemp_nb(abt_io_instance_id aid, char *template, int flags, int *ret) +abt_io_op_t* abt_io_mkostemp_nb(abt_io_instance_id aid, char *tpl, int flags, int *ret) { abt_io_op_t *op; int iret; @@ -460,7 +460,7 @@ abt_io_op_t* abt_io_mkostemp_nb(abt_io_instance_id aid, char *template, int flag op = malloc(sizeof(*op)); if (op == NULL) return NULL; - iret = issue_mkostemp(aid->progress_pool, op, template, flags, ret); + iret = issue_mkostemp(aid->progress_pool, op, tpl, flags, ret); if (iret != 0) { free(op); return NULL; } else return op; } Loading
ifs/scripts/patches/abt_io_cplusplus_template_clash.patchdeleted 100644 → 0 +0 −70 Original line number Diff line number Diff line diff --git a/include/abt-io.h b/include/abt-io.h index 54c3ed6..7e5c71d 100644 --- a/include/abt-io.h +++ b/include/abt-io.h @@ -114,14 +114,14 @@ abt_io_op_t* abt_io_pread_nb( /** * wrapper for mkostemp() */ -int abt_io_mkostemp(abt_io_instance_id aid, char *template, int flags); +int abt_io_mkostemp(abt_io_instance_id aid, char *tpl, int flags); /** * non-blocking wrapper for mkostemp() */ abt_io_op_t* abt_io_mkostemp_nb( abt_io_instance_id aid, - char *template, + char *tpl, int flags, int *ret); diff --git a/src/abt-io.c b/src/abt-io.c index f612dc9..87d3508 100644 --- a/src/abt-io.c +++ b/src/abt-io.c @@ -401,7 +401,7 @@ static void abt_io_mkostemp_fn(void *foo) return; } -static int issue_mkostemp(ABT_pool pool, abt_io_op_t *op, char* template, int flags, int *ret) +static int issue_mkostemp(ABT_pool pool, abt_io_op_t *op, char* tpl, int flags, int *ret) { struct abt_io_mkostemp_state state; struct abt_io_mkostemp_state *pstate = NULL; @@ -416,7 +416,7 @@ static int issue_mkostemp(ABT_pool pool, abt_io_op_t *op, char* template, int fl *ret = -ENOSYS; pstate->ret = ret; - pstate->template = template; + pstate->template = tpl; pstate->flags = flags; pstate->eventual = NULL; rc = ABT_eventual_create(0, &pstate->eventual); @@ -445,14 +445,14 @@ err: return -1; } -int abt_io_mkostemp(abt_io_instance_id aid, char *template, int flags) +int abt_io_mkostemp(abt_io_instance_id aid, char *tpl, int flags) { int ret = -1; - issue_mkostemp(aid->progress_pool, NULL, template, flags, &ret); + issue_mkostemp(aid->progress_pool, NULL, tpl, flags, &ret); return ret; } -abt_io_op_t* abt_io_mkostemp_nb(abt_io_instance_id aid, char *template, int flags, int *ret) +abt_io_op_t* abt_io_mkostemp_nb(abt_io_instance_id aid, char *tpl, int flags, int *ret) { abt_io_op_t *op; int iret; @@ -460,7 +460,7 @@ abt_io_op_t* abt_io_mkostemp_nb(abt_io_instance_id aid, char *template, int flag op = malloc(sizeof(*op)); if (op == NULL) return NULL; - iret = issue_mkostemp(aid->progress_pool, op, template, flags, ret); + iret = issue_mkostemp(aid->progress_pool, op, tpl, flags, ret); if (iret != 0) { free(op); return NULL; } else return op; }