From c6d6c9aece8edc2844fbcdc61a6331b42e2cfd7a Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Tue, 4 Oct 2011 14:42:40 +0000 Subject: [PATCH] Remove some #if by using the correct macro (aka. ORTE_EPOCH_CMP). This commit was SVN r25229. --- orte/mca/routed/radix/routed_radix.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/orte/mca/routed/radix/routed_radix.c b/orte/mca/routed/radix/routed_radix.c index 9108fcabee..837c6da615 100644 --- a/orte/mca/routed/radix/routed_radix.c +++ b/orte/mca/routed/radix/routed_radix.c @@ -314,14 +314,9 @@ static orte_process_name_t get_route(orte_process_name_t *target) daemon.vpid = ORTE_PROC_MY_DAEMON->vpid; ORTE_EPOCH_SET(daemon.epoch,ORTE_PROC_MY_DAEMON->epoch); -#if ORTE_ENABLE_EPOCH if (target->jobid == ORTE_JOBID_INVALID || target->vpid == ORTE_VPID_INVALID || - target->epoch == ORTE_EPOCH_INVALID) { -#else - if (target->jobid == ORTE_JOBID_INVALID || - target->vpid == ORTE_VPID_INVALID) { -#endif + 0 == ORTE_EPOCH_CMP(target->epoch,ORTE_EPOCH_INVALID) ) { ret = ORTE_NAME_INVALID; goto found; }