Warning cleanups. On some OSes the iov_base member of the iovec structure is defined as an void * when
on others as an char*. Thus the right side of all assignment should be explicitly casted to an void* in order to avoid any casting complaints from the compilers. This commit was SVN r7607.
Этот коммит содержится в:
родитель
3453a6c0e9
Коммит
6b3d02b514
ompi/mca/btl/tcp
@ -374,7 +374,7 @@ int mca_btl_tcp_send(
|
||||
frag->iov_idx = 0;
|
||||
frag->iov_cnt = 1;
|
||||
frag->iov_ptr = frag->iov;
|
||||
frag->iov[0].iov_base = &frag->hdr;
|
||||
frag->iov[0].iov_base = (void*)&frag->hdr;
|
||||
frag->iov[0].iov_len = sizeof(frag->hdr);
|
||||
frag->hdr.size = 0;
|
||||
for(i=0; i<frag->base.des_src_cnt; i++) {
|
||||
@ -414,9 +414,9 @@ int mca_btl_tcp_put(
|
||||
frag->hdr.size = 0;
|
||||
frag->iov_cnt = 2;
|
||||
frag->iov_ptr = frag->iov;
|
||||
frag->iov[0].iov_base = &frag->hdr;
|
||||
frag->iov[0].iov_base = (void*)&frag->hdr;
|
||||
frag->iov[0].iov_len = sizeof(frag->hdr);
|
||||
frag->iov[1].iov_base = frag->base.des_dst;
|
||||
frag->iov[1].iov_base = (void*)frag->base.des_dst;
|
||||
frag->iov[1].iov_len = frag->base.des_dst_cnt * sizeof(mca_btl_base_segment_t);
|
||||
for(i=0; i<frag->base.des_src_cnt; i++) {
|
||||
frag->hdr.size += frag->segments[i].seg_len;
|
||||
@ -455,9 +455,9 @@ int mca_btl_tcp_get(
|
||||
frag->hdr.size = 0;
|
||||
frag->iov_cnt = 2;
|
||||
frag->iov_ptr = frag->iov;
|
||||
frag->iov[0].iov_base = &frag->hdr;
|
||||
frag->iov[0].iov_base = (void*)&frag->hdr;
|
||||
frag->iov[0].iov_len = sizeof(frag->hdr);
|
||||
frag->iov[1].iov_base = frag->base.des_src;
|
||||
frag->iov[1].iov_base = (void*)frag->base.des_src;
|
||||
frag->iov[1].iov_len = frag->base.des_src_cnt * sizeof(mca_btl_base_segment_t);
|
||||
frag->hdr.base.tag = MCA_BTL_TAG_BTL;
|
||||
frag->hdr.type = MCA_BTL_TCP_HDR_TYPE_GET;
|
||||
|
@ -168,7 +168,7 @@ bool mca_btl_tcp_frag_recv(mca_btl_tcp_frag_t* frag, int sd)
|
||||
switch(frag->hdr.type) {
|
||||
case MCA_BTL_TCP_HDR_TYPE_SEND:
|
||||
if(frag->iov_idx == 1) {
|
||||
frag->iov[1].iov_base = (frag+1);
|
||||
frag->iov[1].iov_base = (void*)(frag+1);
|
||||
frag->iov[1].iov_len = frag->hdr.size;
|
||||
frag->segments[0].seg_addr.pval = frag+1;
|
||||
frag->segments[0].seg_len = frag->hdr.size;
|
||||
@ -178,7 +178,7 @@ bool mca_btl_tcp_frag_recv(mca_btl_tcp_frag_t* frag, int sd)
|
||||
break;
|
||||
case MCA_BTL_TCP_HDR_TYPE_PUT:
|
||||
if(frag->iov_idx == 1) {
|
||||
frag->iov[1].iov_base = frag->segments;
|
||||
frag->iov[1].iov_base = (void*)frag->segments;
|
||||
frag->iov[1].iov_len = frag->hdr.count * sizeof(mca_btl_base_segment_t);
|
||||
frag->iov_cnt++;
|
||||
return false;
|
||||
|
@ -124,7 +124,7 @@ do { \
|
||||
frag->btl = ep->endpoint_btl; \
|
||||
frag->endpoint = ep; \
|
||||
frag->iov[0].iov_len = sizeof(frag->hdr); \
|
||||
frag->iov[0].iov_base = &frag->hdr; \
|
||||
frag->iov[0].iov_base = (void*)&frag->hdr; \
|
||||
frag->iov_cnt = 1; \
|
||||
frag->iov_idx = 0; \
|
||||
frag->iov_ptr = frag->iov; \
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user