From 69d2b818f7ce4e9d367d75f0819d2e98bf185936 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Wed, 4 Feb 2015 13:35:05 -0700 Subject: [PATCH] mtl/query: squash compiler warning Squash compiler warnings now showing up in the query methods for the mtls. Cast pointers to the different mtl module specific types to the mca_base_module_t. Also, fix up a missing extern in mtl_psm_types.h. This was causing "multiple definition" errors when building the mca_mtl_psm.so shared library. --- ompi/mca/mtl/mxm/mtl_mxm_component.c | 2 +- ompi/mca/mtl/ofi/mtl_ofi_component.c | 2 +- ompi/mca/mtl/portals4/mtl_portals4_component.c | 2 +- ompi/mca/mtl/psm/mtl_psm_component.c | 2 +- ompi/mca/mtl/psm/mtl_psm_types.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ompi/mca/mtl/mxm/mtl_mxm_component.c b/ompi/mca/mtl/mxm/mtl_mxm_component.c index 8d063e746f..b8acc91ba7 100644 --- a/ompi/mca/mtl/mxm/mtl_mxm_component.c +++ b/ompi/mca/mtl/mxm/mtl_mxm_component.c @@ -267,7 +267,7 @@ static int ompi_mtl_mxm_component_query(mca_base_module_t **module, int *priorit */ *priority = param_priority; - *module = &ompi_mtl_mxm.super; + *module = (mca_base_module_t *)&ompi_mtl_mxm.super; return OMPI_SUCCESS; } diff --git a/ompi/mca/mtl/ofi/mtl_ofi_component.c b/ompi/mca/mtl/ofi/mtl_ofi_component.c index 3ed6ecaf1f..9080bcbdea 100644 --- a/ompi/mca/mtl/ofi/mtl_ofi_component.c +++ b/ompi/mca/mtl/ofi/mtl_ofi_component.c @@ -108,7 +108,7 @@ static int ompi_mtl_ofi_component_query(mca_base_module_t **module, int *priority) { *priority = param_priority; - *module = &ompi_mtl_ofi.base; + *module = (mca_base_module_t *)&ompi_mtl_ofi.base; return OMPI_SUCCESS; } diff --git a/ompi/mca/mtl/portals4/mtl_portals4_component.c b/ompi/mca/mtl/portals4/mtl_portals4_component.c index 7effc93991..10910ff299 100644 --- a/ompi/mca/mtl/portals4/mtl_portals4_component.c +++ b/ompi/mca/mtl/portals4/mtl_portals4_component.c @@ -232,7 +232,7 @@ ompi_mtl_portals4_component_query(mca_base_module_t **module, int *priority) */ *priority = param_priority; - *module = &ompi_mtl_portals4.base; + *module = (mca_base_module_t *)&ompi_mtl_portals4.base; return OMPI_SUCCESS; } diff --git a/ompi/mca/mtl/psm/mtl_psm_component.c b/ompi/mca/mtl/psm/mtl_psm_component.c index 9653e281f0..948950be2c 100644 --- a/ompi/mca/mtl/psm/mtl_psm_component.c +++ b/ompi/mca/mtl/psm/mtl_psm_component.c @@ -200,7 +200,7 @@ ompi_mtl_psm_component_query(mca_base_module_t **module, int *priority) */ *priority = param_priority; - *module = &ompi_mtl_psm.super; + *module = (mca_base_module_t *)&ompi_mtl_psm.super; return OMPI_SUCCESS; } diff --git a/ompi/mca/mtl/psm/mtl_psm_types.h b/ompi/mca/mtl/psm/mtl_psm_types.h index 734825ce60..8516b688e9 100644 --- a/ompi/mca/mtl/psm/mtl_psm_types.h +++ b/ompi/mca/mtl/psm/mtl_psm_types.h @@ -70,7 +70,7 @@ struct mca_mtl_psm_component_t { }; typedef struct mca_mtl_psm_component_t mca_mtl_psm_component_t; -OMPI_DECLSPEC mca_mtl_psm_component_t mca_mtl_psm_component; +OMPI_DECLSPEC extern mca_mtl_psm_component_t mca_mtl_psm_component; #define PSM_MAKE_MQTAG(ctxt,rank,utag) \ ( (((ctxt)&0xffffULL)<<48)| (((rank)&0xffffULL)<<32)| \