From 24bfb3e77ba8cf8596f6ac13a7ea8208da314dde Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Mon, 5 Mar 2012 14:08:47 +0000 Subject: [PATCH] Promote from int32_t to size_t. This commit was SVN r26096. --- opal/datatype/opal_datatype_copy.h | 6 +++--- opal/datatype/opal_datatype_internal.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/opal/datatype/opal_datatype_copy.h b/opal/datatype/opal_datatype_copy.h index 5f23394d99..7519674765 100644 --- a/opal/datatype/opal_datatype_copy.h +++ b/opal/datatype/opal_datatype_copy.h @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; -*- */ /* - * Copyright (c) 2004-2010 The University of Tennessee and The University + * Copyright (c) 2004-2012 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. @@ -36,7 +36,7 @@ static inline void _predefined_data( const dt_elem_desc_t* ELEM, const opal_datatype_t* DATATYPE, unsigned char* SOURCE_BASE, - int32_t TOTAL_COUNT, + size_t TOTAL_COUNT, uint32_t COUNT, unsigned char* SOURCE, unsigned char* DESTINATION, @@ -79,7 +79,7 @@ static inline void _predefined_data( const dt_elem_desc_t* ELEM, static inline void _contiguous_loop( const dt_elem_desc_t* ELEM, const opal_datatype_t* DATATYPE, unsigned char* SOURCE_BASE, - int32_t TOTAL_COUNT, + size_t TOTAL_COUNT, uint32_t COUNT, unsigned char* SOURCE, unsigned char* DESTINATION, diff --git a/opal/datatype/opal_datatype_internal.h b/opal/datatype/opal_datatype_internal.h index c4954900e6..36da9b7bd1 100644 --- a/opal/datatype/opal_datatype_internal.h +++ b/opal/datatype/opal_datatype_internal.h @@ -3,7 +3,7 @@ * Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2010 The University of Tennessee and The University + * Copyright (c) 2004-2012 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2006 High Performance Computing Center Stuttgart, @@ -568,9 +568,9 @@ do { \ ((PDATA)->ub - (PDATA)->lb) * ((COUNT) - 1); \ if( ((ACTPTR) < __lower_bound) || ((ACTPTR) >= __upper_bound) ) { \ opal_datatype_safeguard_pointer_debug_breakpoint( (ACTPTR), (LENGTH), (INITPTR), (PDATA), (COUNT) ); \ - opal_output( 0, "%s:%d\n\tPointer %p size %lu is outside [%p,%p] for\n\tbase ptr %p count %d and data \n", \ + opal_output( 0, "%s:%d\n\tPointer %p size %lu is outside [%p,%p] for\n\tbase ptr %p count %lu and data \n", \ __FILE__, __LINE__, (ACTPTR), (unsigned long)(LENGTH), __lower_bound, __upper_bound, \ - (INITPTR), (COUNT) ); \ + (INITPTR), (unsigned long)(COUNT) ); \ opal_datatype_dump( (PDATA) ); \ } \ }