Fixes (after the new ORTE resiliency layer was merged) to make the trunk build with C/R flags turned on.

This commit was SVN r24872.

orte/mca/errmgr/hnp/errmgr_hnp.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2010 The Trustees of Indiana University.
+ * Copyright (c) 2009-2011 The Trustees of Indiana University.
  *                         All rights reserved.
  * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved. 
  * Copyright (c) 2010-2011 Oak Ridge National Labs.  All rights reserved.
@@ -108,7 +108,6 @@ static void killprocs(orte_jobid_t job, orte_vpid_t vpid, orte_epoch_t epoch);
 static int hnp_relocate(orte_job_t *jdata, orte_process_name_t *proc,
                         orte_proc_state_t state, orte_exit_code_t exit_code);
 static orte_odls_child_t* proc_is_local(orte_process_name_t *proc);
-static int orte_errmgr_hnp_record_dead_process(orte_process_name_t *proc);
 static int send_to_local_applications(opal_pointer_array_t *dead_names);
 
 /************************

orte/mca/errmgr/hnp/errmgr_hnp.h

@@ -84,6 +84,7 @@ int orte_errmgr_hnp_global_post_startup(void);
 int orte_errmgr_hnp_global_pre_shutdown(void);
 int orte_errmgr_hnp_global_mark_processes_as_dead(opal_pointer_array_t *dead_procs);
 int orte_errmgr_hnp_global_failure_notification(orte_process_name_t *sender, opal_buffer_t *buffer);
+int orte_errmgr_hnp_record_dead_process(orte_process_name_t *proc);
 
 /* HNP Versions */
 int orte_errmgr_hnp_base_global_init(void);

orte/mca/errmgr/hnp/errmgr_hnp_autor.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2010 The Trustees of Indiana University.
+ * Copyright (c) 2009-2011 The Trustees of Indiana University.
  *                         All rights reserved.
  * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
  * Copyright (c) 2004-2011 The University of Tennessee and The University
@@ -617,7 +617,7 @@ static void errmgr_autor_process_fault_daemon(orte_job_t *jdata,
     /*
      * Record the dead daemon
      */
-    orte_errmgr_hnp_record_dead_daemon(jdata, proc->vpid, state, 0);
+    orte_errmgr_hnp_record_dead_process(proc);
 
     return;
 }

orte/mca/sstore/central/sstore_central_global.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c)      2010 The Trustees of Indiana University.
+ * Copyright (c)      2011 The Trustees of Indiana University.
  *                         All rights reserved.
  * Copyright (c) 2004-2011 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
@@ -50,6 +50,7 @@
 #include "orte/runtime/orte_globals.h"
 #include "orte/runtime/orte_wait.h"
 #include "orte/mca/errmgr/errmgr.h"
+#include "orte/mca/ess/ess.h"
 #include "orte/mca/rml/rml_types.h"
 #include "orte/mca/snapc/snapc.h"
 #include "orte/mca/snapc/base/base.h"

orte/mca/sstore/central/sstore_central_local.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c)      2010 The Trustees of Indiana University.
+ * Copyright (c)      2011 The Trustees of Indiana University.
  *                         All rights reserved.
  * Copyright (c) 2004-2011 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
@@ -547,7 +547,7 @@ static orte_sstore_central_local_app_snapshot_info_t *find_app_handle_info(orte_
 {
     orte_sstore_central_local_app_snapshot_info_t *app_info = NULL;
     opal_list_item_t* item = NULL;
-    orte_bs_cmp_bitmask_t mask;
+    orte_ns_cmp_bitmask_t mask;
 
     for(item  = opal_list_get_first(handle_info->app_info_handle);
         item != opal_list_get_end(handle_info->app_info_handle);

orte/mca/sstore/stage/sstore_stage_global.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c)      2010 The Trustees of Indiana University.
+ * Copyright (c)      2011 The Trustees of Indiana University.
  *                         All rights reserved.
  * Copyright (c) 2004-2011 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
@@ -55,6 +55,7 @@
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/mca/errmgr/base/base.h"
 #include "orte/mca/errmgr/base/errmgr_private.h"
+#include "orte/mca/ess/ess.h"
 #include "orte/mca/rml/rml_types.h"
 #include "orte/mca/filem/filem.h"
 #include "orte/mca/grpcomm/grpcomm.h"