Commit e908dd07 authored by Jonathan Jenkins's avatar Jonathan Jenkins
Browse files

casts for c++ broke compiling in c mode

parent b5332aff
...@@ -48,7 +48,7 @@ int lp_io_write(tw_lpid gid, char* identifier, int size, void* buffer) ...@@ -48,7 +48,7 @@ int lp_io_write(tw_lpid gid, char* identifier, int size, void* buffer)
return(-1); return(-1);
} }
buf = (io_buffer*)malloc(sizeof(*buf)); buf = (struct io_buffer*)malloc(sizeof(*buf));
if(!buf) if(!buf)
return(-1); return(-1);
......
...@@ -96,7 +96,7 @@ int codes_workload_load(const char* type, const char* params, int rank) ...@@ -96,7 +96,7 @@ int codes_workload_load(const char* type, const char* params, int rank)
} }
if(tmp == NULL) if(tmp == NULL)
{ {
tmp = (rank_queue*)malloc(sizeof(*tmp)); tmp = (struct rank_queue*)malloc(sizeof(*tmp));
assert(tmp); assert(tmp);
tmp->rank = rank; tmp->rank = rank;
tmp->lifo = NULL; tmp->lifo = NULL;
......
...@@ -58,7 +58,7 @@ struct codes_iolang_wrkld_state_per_rank ...@@ -58,7 +58,7 @@ struct codes_iolang_wrkld_state_per_rank
int iolang_io_workload_load(const char* params, int rank) int iolang_io_workload_load(const char* params, int rank)
{ {
int t = -1; int t = -1;
iolang_params* i_param = (iolang_params*)params; iolang_params* i_param = (struct iolang_params*)params;
/* we have to get the number of compute nodes/ranks from the bg/p model parameters /* we have to get the number of compute nodes/ranks from the bg/p model parameters
* because the number of ranks are specified in the iolang config file not the * because the number of ranks are specified in the iolang config file not the
...@@ -75,7 +75,7 @@ int iolang_io_workload_load(const char* params, int rank) ...@@ -75,7 +75,7 @@ int iolang_io_workload_load(const char* params, int rank)
return -1; return -1;
} }
} }
wrkld_per_rank = (codes_bgp_wrkld_state_per_rank*)malloc(sizeof(*wrkld_per_rank)); wrkld_per_rank = (codes_iolang_wrkld_state_per_rank*)malloc(sizeof(*wrkld_per_rank));
if(!wrkld_per_rank) if(!wrkld_per_rank)
return -1; return -1;
...@@ -141,7 +141,7 @@ void iolang_io_workload_get_next(int rank, struct codes_workload_op *op) ...@@ -141,7 +141,7 @@ void iolang_io_workload_get_next(int rank, struct codes_workload_op *op)
next_wrkld = qhash_entry(hash_link, struct codes_iolang_wrkld_state_per_rank, hash_link); next_wrkld = qhash_entry(hash_link, struct codes_iolang_wrkld_state_per_rank, hash_link);
int type = codes_kernel_helper_parse_input(next_wrkld->codes_pstate, &(next_wrkld->codes_context),&(next_wrkld->next_event)); int type = codes_kernel_helper_parse_input(next_wrkld->codes_pstate, &(next_wrkld->codes_context),&(next_wrkld->next_event));
op->op_type = (codes_workload_op_type) convertTypes(type); op->op_type = (enum codes_workload_op_type) convertTypes(type);
if (op->op_type == CODES_WK_IGNORE) if (op->op_type == CODES_WK_IGNORE)
return; return;
switch(op->op_type) switch(op->op_type)
......
...@@ -45,7 +45,7 @@ static int test_workload_load(const char* params, int rank) ...@@ -45,7 +45,7 @@ static int test_workload_load(const char* params, int rank)
*/ */
struct wkload_stream_state* newv; struct wkload_stream_state* newv;
newv = (wkload_stream_state*)malloc(sizeof(*newv)); newv = (struct wkload_stream_state*)malloc(sizeof(*newv));
if(!newv) if(!newv)
return(-1); return(-1);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment