From 18d119bc063143fec84afd244fc90b31f9a539b3 Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Wed, 18 Oct 2006 21:10:11 +0000 Subject: [PATCH] No more warnings. This commit was SVN r12181. --- ompi/datatype/dt_module.c | 4 ++-- ompi/mca/mtl/base/mtl_base_datatype.h | 2 +- ompi/mca/mtl/mx/mtl_mx_types.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ompi/datatype/dt_module.c b/ompi/datatype/dt_module.c index 460150aeb4..9a03ba9388 100644 --- a/ompi/datatype/dt_module.c +++ b/ompi/datatype/dt_module.c @@ -719,7 +719,7 @@ static int __dump_data_desc( dt_elem_desc_t* pDesc, int nbElems, char* ptr, size else index += snprintf( ptr + index, length - index, "count %d disp 0x%lx (%ld) extent %d (size %ld)\n", (int)pDesc->elem.count, (long)pDesc->elem.disp, (long)pDesc->elem.disp, - (int)pDesc->elem.extent, pDesc->elem.count * ompi_ddt_basicDatatypes[pDesc->elem.common.type]->size ); + (int)pDesc->elem.extent, (long)(pDesc->elem.count * ompi_ddt_basicDatatypes[pDesc->elem.common.type]->size) ); pDesc++; if( length <= index ) break; @@ -756,7 +756,7 @@ void ompi_ddt_dump( const ompi_datatype_t* pData ) index += snprintf( buffer, length - index, "Datatype %p[%s] size %ld align %d id %d length %d used %d\n" "true_lb %ld true_ub %ld (true_extent %ld) lb %ld ub %ld (extent %ld)\n" "nbElems %d loops %d flags %X (", - (void*)pData, pData->name, pData->size, (int)pData->align, pData->id, (int)pData->desc.length, (int)pData->desc.used, + (void*)pData, pData->name, (long)pData->size, (int)pData->align, pData->id, (int)pData->desc.length, (int)pData->desc.used, (long)pData->true_lb, (long)pData->true_ub, (long)(pData->true_ub - pData->true_lb), (long)pData->lb, (long)pData->ub, (long)(pData->ub - pData->lb), (int)pData->nbElems, (int)pData->btypes[DT_LOOP], (int)pData->flags ); diff --git a/ompi/mca/mtl/base/mtl_base_datatype.h b/ompi/mca/mtl/base/mtl_base_datatype.h index 3e09b69025..ed520f2790 100644 --- a/ompi/mca/mtl/base/mtl_base_datatype.h +++ b/ompi/mca/mtl/base/mtl_base_datatype.h @@ -65,7 +65,7 @@ ompi_mtl_datatype_recv_buf(struct ompi_convertor_t *convertor, bool *free_on_error) { size_t max_data; - long lb; + ptrdiff_t lb; ompi_convertor_get_packed_size(convertor, &max_data); diff --git a/ompi/mca/mtl/mx/mtl_mx_types.h b/ompi/mca/mtl/mx/mtl_mx_types.h index 8f5399defa..85f3439595 100644 --- a/ompi/mca/mtl/mx/mtl_mx_types.h +++ b/ompi/mca/mtl/mx/mtl_mx_types.h @@ -69,13 +69,13 @@ extern mca_mtl_mx_component_t mca_mtl_mx_component; * | | */ -#define MX_SOURCE_MASK 0x0000FFFF00000000 -#define MX_TAG_MASK 0x00000000FFFFFFFF +#define MX_SOURCE_MASK 0x0000FFFF00000000ULL +#define MX_TAG_MASK 0x00000000FFFFFFFFULL #define MX_SOURCE_IGNR ~MX_SOURCE_MASK /* we need to keep top bit (sign bit) of the tag collectives use this to distinguish the message */ -#define MX_TAG_IGNR 0xFFFFFFFF80000000 +#define MX_TAG_IGNR 0xFFFFFFFF80000000ULL /* get the tag from the bits */ #define MX_GET_TAG(match_bits, tag) \