From d182ae7472683dd0669c0c86ac239b20acb96dea Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Fri, 3 Nov 2006 20:45:22 +0000 Subject: [PATCH] Clean up a few compiler warnings courtesy of Jeff This commit was SVN r12430. --- orte/mca/odls/bproc/odls_bproc.h | 2 +- orte/mca/ras/bjs/ras_bjs.c | 6 +++++- orte/mca/rmgr/proxy/rmgr_proxy.c | 2 +- orte/mca/rmgr/urm/rmgr_urm.c | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/orte/mca/odls/bproc/odls_bproc.h b/orte/mca/odls/bproc/odls_bproc.h index 0a9888894e..016b882472 100644 --- a/orte/mca/odls/bproc/odls_bproc.h +++ b/orte/mca/odls/bproc/odls_bproc.h @@ -59,7 +59,7 @@ int orte_odls_bproc_finalize(void); int orte_odls_bproc_subscribe_launch_data(orte_jobid_t job, orte_gpr_notify_cb_fn_t cbfunc); int orte_odls_bproc_launch_local_procs(orte_gpr_notify_data_t *data, char **base_environ); int orte_odls_bproc_kill_local_procs(orte_jobid_t job, bool set_state); -int orte_odls_bproc_signal_local_procs(orte_process_name_t* proc_name, int32_t signal); +int orte_odls_bproc_signal_local_procs(const orte_process_name_t* proc_name, int32_t signal); /** * ODLS bproc_orted component diff --git a/orte/mca/ras/bjs/ras_bjs.c b/orte/mca/ras/bjs/ras_bjs.c index d76541c3e5..d454bafce1 100644 --- a/orte/mca/ras/bjs/ras_bjs.c +++ b/orte/mca/ras/bjs/ras_bjs.c @@ -88,7 +88,10 @@ static size_t orte_ras_bjs_node_slots(char* node_name) return count; } - +#if 0 +/* hang on to this code - it is used in the discover procedure, but + * is currently disabled + */ /** * Resolve the node name to node number. */ @@ -100,6 +103,7 @@ static int orte_ras_bjs_node_resolve(char* node_name, int* node_num) return ORTE_ERROR; return ORTE_SUCCESS; } +#endif /** diff --git a/orte/mca/rmgr/proxy/rmgr_proxy.c b/orte/mca/rmgr/proxy/rmgr_proxy.c index 9a5dcbdbd4..fccb469718 100644 --- a/orte/mca/rmgr/proxy/rmgr_proxy.c +++ b/orte/mca/rmgr/proxy/rmgr_proxy.c @@ -369,7 +369,7 @@ static int orte_rmgr_proxy_spawn_job( /* check for any flow directives to control what we do */ if (NULL != (flow = orte_rmgr.find_attribute(attributes, ORTE_RMGR_SPAWN_FLOW))) { /* something was specified - get the value */ - if (ORTE_SUCCESS != (rc = orte_dss.get(&fptr, flow->value, ORTE_UINT8))) { + if (ORTE_SUCCESS != (rc = orte_dss.get((void**)&fptr, flow->value, ORTE_UINT8))) { ORTE_ERROR_LOG(rc); return rc; } diff --git a/orte/mca/rmgr/urm/rmgr_urm.c b/orte/mca/rmgr/urm/rmgr_urm.c index 1bd4440916..6e578e33a3 100644 --- a/orte/mca/rmgr/urm/rmgr_urm.c +++ b/orte/mca/rmgr/urm/rmgr_urm.c @@ -312,7 +312,7 @@ static int orte_rmgr_urm_spawn_job( /* check for any flow directives to control what we do */ if (NULL != (flow = orte_rmgr.find_attribute(attributes, ORTE_RMGR_SPAWN_FLOW))) { /* something was specified - get the value */ - if (ORTE_SUCCESS != (rc = orte_dss.get(&fptr, flow->value, ORTE_UINT8))) { + if (ORTE_SUCCESS != (rc = orte_dss.get((void**)&fptr, flow->value, ORTE_UINT8))) { ORTE_ERROR_LOG(rc); return rc; }