Skip to content

Commit e1c6b0e

Browse files
bosilcabosilca
committed
Some compilers are more than picky.
1 parent a15b648 commit e1c6b0e

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

‎opal/datatype/opal_convertor_raw.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ opal_convertor_raw( opal_convertor_t* pConvertor,
101101
OPAL_DATATYPE_SAFEGUARD_POINTER( source_base, blength, pConvertor->pBaseBuf,
102102
pConvertor->pDesc, pConvertor->count );
103103
DO_DEBUG( opal_output( 0, "raw 1. iov[%d] = {base %p, length %lu}\n",
104-
index, source_base, (unsigned long)blength ); );
104+
index, (void*)source_base, (unsigned long)blength ); );
105105
iov[index].iov_base = (IOVBASE_TYPE *) source_base;
106106
iov[index].iov_len = blength;
107107
source_base += blength;
@@ -114,7 +114,7 @@ opal_convertor_raw( opal_convertor_t* pConvertor,
114114
OPAL_DATATYPE_SAFEGUARD_POINTER( source_base, blength, pConvertor->pBaseBuf,
115115
pConvertor->pDesc, pConvertor->count );
116116
DO_DEBUG( opal_output( 0, "raw 2. iov[%d] = {base %p, length %lu}\n",
117-
index, source_base, (unsigned long)blength ); );
117+
index, (void*)source_base, (unsigned long)blength ); );
118118
iov[index].iov_base = (IOVBASE_TYPE *) source_base;
119119
iov[index].iov_len = blength;
120120
source_base += pElem->elem.extent;

‎opal/datatype/opal_datatype_copy.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ int32_t opal_datatype_copy_content_same_ddt( const opal_datatype_t* datatype, in
107107
#endif
108108

109109
DO_DEBUG( opal_output( 0, "opal_datatype_copy_content_same_ddt( %p, %d, dst %p, src %p )\n",
110-
(void*)datatype, count, destination_base, source_base ); );
110+
(void*)datatype, count, (void*)destination_base, (void*)source_base ); );
111111

112112
/* empty data ? then do nothing. This should normally be trapped
113113
* at a higher level.

‎opal/datatype/opal_datatype_copy.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static inline void _predefined_data( const dt_elem_desc_t* ELEM,
6262
(DATATYPE), (TOTAL_COUNT) );
6363
/* the extent and the size of the basic datatype are equals */
6464
DO_DEBUG( opal_output( 0, "copy 1. %s( %p, %p, %lu ) => space %lu\n",
65-
STRINGIFY(MEM_OP_NAME), _destination, _source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE)) ); );
65+
STRINGIFY(MEM_OP_NAME), (void*)_destination, (void*)_source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE)) ); );
6666
MEM_OP( _destination, _source, _copy_blength );
6767
_source += _copy_blength;
6868
_destination += _copy_blength;
@@ -72,7 +72,7 @@ static inline void _predefined_data( const dt_elem_desc_t* ELEM,
7272
OPAL_DATATYPE_SAFEGUARD_POINTER( _source, _copy_blength, (SOURCE_BASE),
7373
(DATATYPE), (TOTAL_COUNT) );
7474
DO_DEBUG( opal_output( 0, "copy 2. %s( %p, %p, %lu ) => space %lu\n",
75-
STRINGIFY(MEM_OP_NAME), _destination, _source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE) - (_i * _copy_blength)) ); );
75+
STRINGIFY(MEM_OP_NAME), (void*)_destination, (void*)_source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE) - (_i * _copy_blength)) ); );
7676
MEM_OP( _destination, _source, _copy_blength );
7777
_source += _elem->extent;
7878
_destination += _elem->extent;
@@ -108,7 +108,7 @@ static inline void _contiguous_loop( const dt_elem_desc_t* ELEM,
108108
OPAL_DATATYPE_SAFEGUARD_POINTER( _source, _end_loop->size, (SOURCE_BASE),
109109
(DATATYPE), (TOTAL_COUNT) );
110110
DO_DEBUG( opal_output( 0, "copy 3. %s( %p, %p, %lu ) => space %lu\n",
111-
STRINGIFY(MEM_OP_NAME), _destination, _source, (unsigned long)_end_loop->size, (unsigned long)(*(SPACE) - _i * _end_loop->size) ); );
111+
STRINGIFY(MEM_OP_NAME), (void*)_destination, (void*)_source, (unsigned long)_end_loop->size, (unsigned long)(*(SPACE) - _i * _end_loop->size) ); );
112112
MEM_OP( _destination, _source, _end_loop->size );
113113
_source += _loop->extent;
114114
_destination += _loop->extent;
@@ -132,7 +132,7 @@ static inline int32_t _copy_content_same_ddt( const opal_datatype_t* datatype, i
132132
*destination = (unsigned char*)destination_base;
133133

134134
DO_DEBUG( opal_output( 0, "_copy_content_same_ddt( %p, %d, dst %p, src %p )\n",
135-
(void*)datatype, count, destination_base, source_base ); );
135+
(void*)datatype, count, (void*)destination_base, (void*)source_base ); );
136136

137137
iov_len_local = count * datatype->size;
138138

@@ -156,7 +156,7 @@ static inline int32_t _copy_content_same_ddt( const opal_datatype_t* datatype, i
156156
OPAL_DATATYPE_SAFEGUARD_POINTER( source, memop_chunk,
157157
(unsigned char*)source_base, datatype, count );
158158
DO_DEBUG( opal_output( 0, "copy c1. %s( %p, %p, %lu ) => space %lu\n",
159-
STRINGIFY(MEM_OP_NAME), destination, source, (unsigned long)memop_chunk, (unsigned long)total_length ); );
159+
STRINGIFY(MEM_OP_NAME), (void*)destination, (void*)source, (unsigned long)memop_chunk, (unsigned long)total_length ); );
160160
MEM_OP( destination, source, memop_chunk );
161161
destination += memop_chunk;
162162
source += memop_chunk;
@@ -170,7 +170,7 @@ static inline int32_t _copy_content_same_ddt( const opal_datatype_t* datatype, i
170170
OPAL_DATATYPE_SAFEGUARD_POINTER( source, datatype->size,
171171
(unsigned char*)source_base, datatype, count );
172172
DO_DEBUG( opal_output( 0, "copy c2. %s( %p, %p, %lu ) => space %lu\n",
173-
STRINGIFY(MEM_OP_NAME), destination, source, (unsigned long)datatype->size,
173+
STRINGIFY(MEM_OP_NAME), (void*)destination, (void*)source, (unsigned long)datatype->size,
174174
(unsigned long)(iov_len_local - (pos_desc * datatype->size)) ); );
175175
MEM_OP( destination, source, datatype->size );
176176
destination += extent;

‎opal/datatype/opal_datatype_unpack.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ opal_unpack_homogeneous_contig_function( opal_convertor_t* pConv,
7575
OPAL_PTRDIFF_TYPE initial_displ = pConv->use_desc->desc[pConv->use_desc->used].end_loop.first_elem_disp;
7676

7777
DO_DEBUG( opal_output( 0, "unpack_homogeneous_contig( pBaseBuf %p, iov_count %d )\n",
78-
pConv->pBaseBuf, *out_size ); );
78+
(void*)pConv->pBaseBuf, *out_size ); );
7979
if( stack[1].type != opal_datatype_uint1.id ) {
8080
stack[1].count *= opal_datatype_basicDatatypes[stack[1].type]->size;
8181
stack[1].type = opal_datatype_uint1.id;
@@ -92,27 +92,27 @@ opal_unpack_homogeneous_contig_function( opal_convertor_t* pConv,
9292
if( (OPAL_PTRDIFF_TYPE)pData->size == extent ) {
9393
user_memory += pConv->bConverted;
9494
DO_DEBUG( opal_output( 0, "unpack_homogeneous_contig( user_memory %p, packed_buffer %p length %lu\n",
95-
user_memory, packed_buffer, (unsigned long)remaining ); );
95+
(void*)user_memory, (void*)packed_buffer, (unsigned long)remaining ); );
9696

9797
/* contiguous data or basic datatype with count */
9898
OPAL_DATATYPE_SAFEGUARD_POINTER( user_memory, remaining,
9999
pConv->pBaseBuf, pData, pConv->count );
100100
DO_DEBUG( opal_output( 0, "1. unpack contig dest %p src %p length %lu\n",
101-
user_memory, packed_buffer, (unsigned long)remaining ); );
101+
(void*)user_memory, (void*)packed_buffer, (unsigned long)remaining ); );
102102
MEMCPY_CSUM( user_memory, packed_buffer, remaining, pConv );
103103
} else {
104104
user_memory += stack[0].disp + stack[1].disp;
105105

106106
DO_DEBUG( opal_output( 0, "unpack_homogeneous_contig( user_memory %p, packed_buffer %p length %lu\n",
107-
user_memory, packed_buffer, (unsigned long)remaining ); );
107+
(void*)user_memory, (void*)packed_buffer, (unsigned long)remaining ); );
108108

109109
length = (0 == pConv->stack_pos ? 0 : stack[1].count); /* left over from the last unpack */
110110
/* complete the last copy */
111111
if( (0 != length) && (length <= remaining) ) {
112112
OPAL_DATATYPE_SAFEGUARD_POINTER( user_memory, length, pConv->pBaseBuf,
113113
pData, pConv->count );
114114
DO_DEBUG( opal_output( 0, "2. unpack dest %p src %p length %lu\n",
115-
user_memory, packed_buffer, (unsigned long)length ); );
115+
(void*)user_memory, (void*)packed_buffer, (unsigned long)length ); );
116116
MEMCPY_CSUM( user_memory, packed_buffer, length, pConv );
117117
packed_buffer += length;
118118
user_memory += (extent - (pData->size - length));
@@ -131,7 +131,7 @@ opal_unpack_homogeneous_contig_function( opal_convertor_t* pConv,
131131
OPAL_DATATYPE_SAFEGUARD_POINTER( user_memory, pData->size, pConv->pBaseBuf,
132132
pData, pConv->count );
133133
DO_DEBUG( opal_output( 0, "3. unpack dest %p src %p length %lu\n",
134-
user_memory, packed_buffer, (unsigned long)pData->size ); );
134+
(void*)user_memory, (void*)packed_buffer, (unsigned long)pData->size ); );
135135
MEMCPY_CSUM( user_memory, packed_buffer, pData->size, pConv );
136136
packed_buffer += pData->size;
137137
user_memory += extent;
@@ -145,7 +145,7 @@ opal_unpack_homogeneous_contig_function( opal_convertor_t* pConv,
145145
OPAL_DATATYPE_SAFEGUARD_POINTER( user_memory, remaining, pConv->pBaseBuf,
146146
pData, pConv->count );
147147
DO_DEBUG( opal_output( 0, "4. unpack dest %p src %p length %lu\n",
148-
user_memory, packed_buffer, (unsigned long)remaining ); );
148+
(void*)user_memory, (void*)packed_buffer, (unsigned long)remaining ); );
149149
MEMCPY_CSUM( user_memory, packed_buffer, remaining, pConv );
150150
user_memory += remaining;
151151
stack[1].count -= remaining;
@@ -188,7 +188,7 @@ opal_unpack_partial_datatype( opal_convertor_t* pConvertor, dt_elem_desc_t* pEle
188188

189189
DO_DEBUG( opal_output( 0, "unpack partial data start %lu end %lu data_length %lu user %p\n"
190190
"\tbConverted %lu total_length %lu count %d\n",
191-
(unsigned long)start_position, (unsigned long)start_position + length, (unsigned long)data_length, *user_buffer,
191+
(unsigned long)start_position, (unsigned long)start_position + length, (unsigned long)data_length, (void*)*user_buffer,
192192
(unsigned long)pConvertor->bConverted, (unsigned long)pConvertor->local_size, pConvertor->count ); );
193193

194194
/* Find a byte that is not used in the partial buffer */
@@ -273,7 +273,7 @@ opal_generic_simple_unpack_function( opal_convertor_t* pConvertor,
273273
uint32_t iov_count;
274274

275275
DO_DEBUG( opal_output( 0, "opal_convertor_generic_simple_unpack( %p, {%p, %lu}, %u )\n",
276-
(void*)pConvertor, iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); );
276+
(void*)pConvertor, (void*)iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); );
277277

278278
description = pConvertor->use_desc->desc;
279279

@@ -452,7 +452,7 @@ opal_unpack_general_function( opal_convertor_t* pConvertor,
452452
int32_t rc;
453453

454454
DO_DEBUG( opal_output( 0, "opal_convertor_general_unpack( %p, {%p, %lu}, %u )\n",
455-
(void*)pConvertor, iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); );
455+
(void*)pConvertor, (void*)iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); );
456456

457457
description = pConvertor->use_desc->desc;
458458

@@ -484,8 +484,8 @@ opal_unpack_general_function( opal_convertor_t* pConvertor,
484484
OPAL_DATATYPE_SAFEGUARD_POINTER( conv_ptr + pElem->elem.disp, pData->size, pConvertor->pBaseBuf,
485485
pData, pConvertor->count );
486486
DO_DEBUG( opal_output( 0, "unpack (%p, %ld) -> (%p:%ld, %d, %ld) type %s\n",
487-
iov_ptr, iov_len_local,
488-
pConvertor->pBaseBuf, conv_ptr + pElem->elem.disp - pConvertor->pBaseBuf,
487+
(void*)iov_ptr, iov_len_local,
488+
(void*)pConvertor->pBaseBuf, conv_ptr + pElem->elem.disp - pConvertor->pBaseBuf,
489489
count_desc, description[pos_desc].elem.extent,
490490
opal_datatype_basicDatatypes[type]->name ); );
491491
rc = master->pFunctions[type]( pConvertor, count_desc,

0 commit comments

Comments
 (0)