Promote from int32_t to size_t.
This commit was SVN r26096.
Этот коммит содержится в:
родитель
af9b6f6161
Коммит
24bfb3e77b
@ -1,6 +1,6 @@
|
|||||||
/* -*- Mode: C; c-basic-offset:4 ; -*- */
|
/* -*- 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
|
* of Tennessee Research Foundation. All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
* Copyright (c) 2009 Oak Ridge National Labs. 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,
|
static inline void _predefined_data( const dt_elem_desc_t* ELEM,
|
||||||
const opal_datatype_t* DATATYPE,
|
const opal_datatype_t* DATATYPE,
|
||||||
unsigned char* SOURCE_BASE,
|
unsigned char* SOURCE_BASE,
|
||||||
int32_t TOTAL_COUNT,
|
size_t TOTAL_COUNT,
|
||||||
uint32_t COUNT,
|
uint32_t COUNT,
|
||||||
unsigned char* SOURCE,
|
unsigned char* SOURCE,
|
||||||
unsigned char* DESTINATION,
|
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,
|
static inline void _contiguous_loop( const dt_elem_desc_t* ELEM,
|
||||||
const opal_datatype_t* DATATYPE,
|
const opal_datatype_t* DATATYPE,
|
||||||
unsigned char* SOURCE_BASE,
|
unsigned char* SOURCE_BASE,
|
||||||
int32_t TOTAL_COUNT,
|
size_t TOTAL_COUNT,
|
||||||
uint32_t COUNT,
|
uint32_t COUNT,
|
||||||
unsigned char* SOURCE,
|
unsigned char* SOURCE,
|
||||||
unsigned char* DESTINATION,
|
unsigned char* DESTINATION,
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
* Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
|
* Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
|
||||||
* University Research and Technology
|
* University Research and Technology
|
||||||
* Corporation. All rights reserved.
|
* 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
|
* of Tennessee Research Foundation. All rights
|
||||||
* reserved.
|
* reserved.
|
||||||
* Copyright (c) 2004-2006 High Performance Computing Center Stuttgart,
|
* Copyright (c) 2004-2006 High Performance Computing Center Stuttgart,
|
||||||
@ -568,9 +568,9 @@ do { \
|
|||||||
((PDATA)->ub - (PDATA)->lb) * ((COUNT) - 1); \
|
((PDATA)->ub - (PDATA)->lb) * ((COUNT) - 1); \
|
||||||
if( ((ACTPTR) < __lower_bound) || ((ACTPTR) >= __upper_bound) ) { \
|
if( ((ACTPTR) < __lower_bound) || ((ACTPTR) >= __upper_bound) ) { \
|
||||||
opal_datatype_safeguard_pointer_debug_breakpoint( (ACTPTR), (LENGTH), (INITPTR), (PDATA), (COUNT) ); \
|
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, \
|
__FILE__, __LINE__, (ACTPTR), (unsigned long)(LENGTH), __lower_bound, __upper_bound, \
|
||||||
(INITPTR), (COUNT) ); \
|
(INITPTR), (unsigned long)(COUNT) ); \
|
||||||
opal_datatype_dump( (PDATA) ); \
|
opal_datatype_dump( (PDATA) ); \
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user