From 6a3225d8004e65434cf3d8d0fef955bc4c2b8ece Mon Sep 17 00:00:00 2001 From: Todd Kordenbrock Date: Mon, 25 Aug 2014 16:30:26 +0000 Subject: [PATCH] Fix invalid symbols left by the PMIx merge. This commit was SVN r32597. --- ompi/mca/mtl/portals4/mtl_portals4.c | 2 +- ompi/mca/mtl/portals4/mtl_portals4_component.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ompi/mca/mtl/portals4/mtl_portals4.c b/ompi/mca/mtl/portals4/mtl_portals4.c index e76d97a9a2..74750123c7 100644 --- a/ompi/mca/mtl/portals4/mtl_portals4.c +++ b/ompi/mca/mtl/portals4/mtl_portals4.c @@ -85,7 +85,7 @@ ompi_mtl_portals4_add_procs(struct mca_mtl_base_module_t *mtl, return OMPI_ERR_NOT_SUPPORTED; } - OMPI_MODEX_RECV(ret, &mca_mtl_portals4_component.mtl_version, + OPAL_MODEX_RECV(ret, &mca_mtl_portals4_component.mtl_version, &procs[i]->super, (char**)&modex_id, &size); if (OMPI_SUCCESS != ret) { opal_output_verbose(1, ompi_mtl_base_framework.framework_output, diff --git a/ompi/mca/mtl/portals4/mtl_portals4_component.c b/ompi/mca/mtl/portals4/mtl_portals4_component.c index 3c926b9d3a..5b08e477ce 100644 --- a/ompi/mca/mtl/portals4/mtl_portals4_component.c +++ b/ompi/mca/mtl/portals4/mtl_portals4_component.c @@ -269,7 +269,7 @@ ompi_mtl_portals4_component_init(bool enable_progress_threads, goto error; } - OPAL_MODEX_SEND(ret, PMIX_SYNC_REQD, OPAL_PMIX_GLOBAL, + OPAL_MODEX_SEND(ret, PMIX_SYNC_REQD, PMIX_GLOBAL, &mca_mtl_portals4_component.mtl_version, &id, sizeof(id)); if (OMPI_SUCCESS != ret) {