* silence a bunch of compiler warnings on Solaris when using the Sun
compilers. This should go to the v1.1 branch This commit was SVN r9693.
Этот коммит содержится в:
родитель
9befdc7d9f
Коммит
1da22f9099
@ -137,7 +137,8 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name,
|
||||
}
|
||||
|
||||
/* map the file and initialize segment state */
|
||||
seg = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
|
||||
seg = (mca_common_sm_file_header_t*)
|
||||
mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
|
||||
if( (void*)-1 == seg ) {
|
||||
opal_output(0, "mca_common_sm_mmap_init: mmap failed with errno=%d\n",
|
||||
errno);
|
||||
@ -238,7 +239,7 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name,
|
||||
fchmod(fd, 0600);
|
||||
close(fd);
|
||||
}
|
||||
if( NULL != seg ) munmap(seg,size);
|
||||
if( NULL != seg ) munmap((void*) seg,size);
|
||||
#else
|
||||
if( NULL != lpvMem ) UnmapViewOfFile( lpvMem );
|
||||
if( NULL != hMapObject ) CloseHandle(hMapObject);
|
||||
@ -253,7 +254,7 @@ int mca_common_sm_mmap_fini( mca_common_sm_mmap_t* sm_mmap )
|
||||
|
||||
if( NULL != sm_mmap->map_seg ) {
|
||||
#if !defined(__WINDOWS__)
|
||||
rc = munmap( sm_mmap->map_addr, sm_mmap->map_size );
|
||||
rc = munmap((void*) sm_mmap->map_addr, sm_mmap->map_size );
|
||||
sm_mmap->map_addr = NULL;
|
||||
sm_mmap->map_size = 0;
|
||||
#else
|
||||
|
@ -243,7 +243,7 @@ ompi_osc_pt2pt_sendreq_send(ompi_osc_pt2pt_module_t *module,
|
||||
size_t max_data = sendreq->req_origin_bytes_packed;
|
||||
|
||||
iov.iov_len = max_data;
|
||||
iov.iov_base = (unsigned char*) descriptor->des_src[0].seg_addr.pval + written_data;
|
||||
iov.iov_base = (void*) ((unsigned char*) descriptor->des_src[0].seg_addr.pval + written_data);
|
||||
|
||||
ret = ompi_convertor_pack(&sendreq->req_origin_convertor, &iov, &iov_count,
|
||||
&max_data, &free_after);
|
||||
@ -420,7 +420,7 @@ ompi_osc_pt2pt_replyreq_send(ompi_osc_pt2pt_module_t *module,
|
||||
size_t max_data = replyreq->rep_target_bytes_packed;
|
||||
|
||||
iov.iov_len = max_data;
|
||||
iov.iov_base = (unsigned char*) descriptor->des_src[0].seg_addr.pval + written_data;
|
||||
iov.iov_base = (void*) ((unsigned char*) descriptor->des_src[0].seg_addr.pval + written_data);
|
||||
|
||||
ret = ompi_convertor_pack(&replyreq->rep_target_convertor, &iov, &iov_count,
|
||||
&max_data, &free_after);
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user