From 6e64e8a1441f21e02b08f70caed36ce68e2ff85a Mon Sep 17 00:00:00 2001
From: Galen Shipman <gshipman@lanl.gov>
Date: Mon, 28 Nov 2005 21:10:02 +0000
Subject: [PATCH] bproc fixes, these exist in the release 1.0 branch.

This commit was SVN r8292.
---
 orte/mca/pls/bproc/pls_bproc.c           | 6 +++---
 orte/mca/pls/bproc_seed/pls_bproc_seed.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/orte/mca/pls/bproc/pls_bproc.c b/orte/mca/pls/bproc/pls_bproc.c
index 8e1e79036e..40b5f1ef5c 100644
--- a/orte/mca/pls/bproc/pls_bproc.c
+++ b/orte/mca/pls/bproc/pls_bproc.c
@@ -119,8 +119,8 @@ static int orte_pls_bproc_node_array(orte_rmaps_base_map_t* map,
     for(item =  opal_list_get_first(&map->nodes);
         item != opal_list_get_end(&map->nodes);
         item =  opal_list_get_next(item)) {
-        if(*node_array_len < atol(((orte_rmaps_base_node_t*)item)->node_name)) {
-            *node_array_len = atol(((orte_rmaps_base_node_t*)item)->node_name);
+        if(*node_array_len < atol(((orte_rmaps_base_node_t*)item)->node->node_name)) {
+            *node_array_len = atol(((orte_rmaps_base_node_t*)item)->node->node_name);
         }
     }
     (*node_array_len)++;
@@ -137,7 +137,7 @@ static int orte_pls_bproc_node_array(orte_rmaps_base_map_t* map,
         item =  opal_list_get_next(item)) {
         orte_rmaps_base_node_t* node = (orte_rmaps_base_node_t*)item;
         num_on_node = opal_list_get_size(&node->node_procs);
-        (*node_array)[atol(node->node_name)] += num_on_node;
+        (*node_array)[atol(node->node->node_name)] += num_on_node;
         num_procs += num_on_node;
     }
     return num_procs;
diff --git a/orte/mca/pls/bproc_seed/pls_bproc_seed.c b/orte/mca/pls/bproc_seed/pls_bproc_seed.c
index 1b20f3c7bf..53cd9a3bc3 100644
--- a/orte/mca/pls/bproc_seed/pls_bproc_seed.c
+++ b/orte/mca/pls/bproc_seed/pls_bproc_seed.c
@@ -82,7 +82,7 @@ static int orte_pls_bproc_nodelist(orte_rmaps_base_map_t* map, int** nodelist, s
         item != opal_list_get_end(&map->nodes);
         item =  opal_list_get_next(item)) {
         orte_rmaps_base_node_t* node = (orte_rmaps_base_node_t*)item;
-        (*nodelist)[index++] = atol(node->node_name);
+        (*nodelist)[index++] = atol(node->node->node_name);
     }
     *num_nodes = count;
     return OMPI_SUCCESS;
@@ -514,7 +514,7 @@ static int orte_pls_bproc_launch_app(
         }
         if(mca_pls_bproc_seed_component.debug) {
             opal_output(0, "orte_pls_bproc: node=%s name=%d.%d.%d procs=%d\n", 
-                node->node_name, 
+			node->node->node_name, 
                 orte_process_info.my_name->cellid, 0, 
                 daemon_vpid_start+rank,
                 opal_list_get_size(&node->node_procs));
@@ -528,7 +528,7 @@ static int orte_pls_bproc_launch_app(
         }
         
         /* save the daemons pid in the registry */
-        rc = orte_pls_base_set_node_pid(node->node_cellid, node->node_name, jobid, getpid());
+        rc = orte_pls_base_set_node_pid(node->node->node_cellid, node->node->node_name, jobid, getpid());
         if(ORTE_SUCCESS != rc) {
             ORTE_ERROR_LOG(rc);
             _exit(-1);