Fix rebase issues.

Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>

Author: hjelmn

ompi/communicator/comm.c

@@ -1530,10 +1530,10 @@ int ompi_intercomm_create_from_groups (ompi_group_t *local_group, int local_lead
     }
 
     /* using 0 for the tag because we control both local_comm and leader_comm */
-    rprocs = ompi_comm_get_rprocs (local_comm, leader_comm, local_leader, leader_comm_remote_leader, 0, rsize);
-    if (OPAL_UNLIKELY(NULL == rprocs)) {
+    rc = ompi_comm_get_rprocs (local_comm, leader_comm, local_leader, leader_comm_remote_leader, 0, rsize, &rprocs);
+    if (OPAL_UNLIKELY(OMPI_SUCCESS != rc)) {
         ompi_comm_free (&local_comm);
-        return OMPI_ERR_OUT_OF_RESOURCE;
+        return rc;
     }
 
     if (!i_am_leader) {

ompi/communicator/comm_cid.c

@@ -516,7 +516,7 @@ static int ompi_comm_checkcid (ompi_comm_request_t *request)
 
     if (OMPI_SUCCESS != request->super.req_status.MPI_ERROR) {
         if (participate) {
-            opal_pointer_array_set_item(&ompi_mpi_communicators, context->nextlocal_cid, NULL);
+            opal_pointer_array_set_item(&ompi_comm_array, context->nextlocal_cid, NULL);
         }
         return request->super.req_status.MPI_ERROR;
     }
@@ -560,7 +560,7 @@ static int ompi_comm_nextcid_check_flag (ompi_comm_request_t *request)
 
     if (OMPI_SUCCESS != request->super.req_status.MPI_ERROR) {
         if (participate) {
-            opal_pointer_array_set_item(&ompi_mpi_communicators, context->nextcid, NULL);
+            opal_pointer_array_set_item(&ompi_comm_array, context->nextcid, NULL);
         }
         return request->super.req_status.MPI_ERROR;
     }

opal/mca/btl/ugni/btl_ugni.h

@@ -306,7 +306,7 @@ static inline uint32_t mca_btl_ugni_ep_get_device_index (mca_btl_ugni_module_t *
     static volatile uint32_t device_index = (uint32_t) 0;
 
     /* don't really care if the device index is atomically updated */
-    return opal_atomic_fetch_add_32 ((volatile int32_t *) &device_index, 1) % mca_btl_ugni_component.virtual_device_count;
+    return opal_atomic_fetch_add_32 ((opal_atomic_int32_t *) &device_index, 1) % mca_btl_ugni_component.virtual_device_count;
 }
 
 /**

opal/runtime/opal_finalize.c

@@ -170,7 +170,6 @@ int opal_finalize(void)
         return OPAL_SUCCESS;
     }
 
-<<<<<<< variant A
     opal_finalize_cleanup_domain (&opal_init_domain);
     OBJ_DESTRUCT(&opal_init_domain);
 
@@ -198,52 +197,4 @@ void opal_warn_fork(void)
         pthread_atfork(warn_fork_cb, NULL, NULL);
         atfork_called = true;
     }
->>>>>>> variant B
-    opal_finalize_cleanup_domain (&opal_init_domain);
-    OBJ_DESTRUCT(&opal_init_domain);
-
-    /* finalize util code */
-    opal_finalize_util();
-
-    return OPAL_SUCCESS;
-####### Ancestor
-    opal_progress_finalize();
-
-    /* close the checkpoint and restart service */
-    opal_cr_finalize();
-
-#if OPAL_ENABLE_FT_CR    == 1
-    (void) mca_base_framework_close(&opal_compress_base_framework);
-#endif
-
-    (void) mca_base_framework_close(&opal_reachable_base_framework);
-
-    (void) mca_base_framework_close(&opal_event_base_framework);
-
-    /* close high resolution timers */
-    (void) mca_base_framework_close(&opal_timer_base_framework);
-
-    (void) mca_base_framework_close(&opal_backtrace_base_framework);
-    (void) mca_base_framework_close(&opal_memchecker_base_framework);
-
-    /* close the memcpy framework */
-    (void) mca_base_framework_close(&opal_memcpy_base_framework);
-
-    /* finalize the memory manager / tracker */
-    opal_mem_hooks_finalize();
-
-    /* close the hwloc framework */
-    (void) mca_base_framework_close(&opal_hwloc_base_framework);
-
-    /* close the shmem framework */
-    (void) mca_base_framework_close(&opal_shmem_base_framework);
-
-    /* cleanup the main thread specific stuff */
-    opal_tsd_keys_destruct();
-
-    /* finalize util code */
-    opal_finalize_util();
-
-    return OPAL_SUCCESS;
-======= end
 }