Merge pull request #8320 from rhc54/topic/warn

rhc54 · web-flow · commit cd49049ab9e7 · 2020-12-27T17:10:37.000-08:00
Silence warnings
diff --git a/3rd-party/openpmix b/3rd-party/openpmix
@@ -1 +1 @@
-Subproject commit 2e3df8ee02bd21e20a3675f580eccc38cbe014a4
+Subproject commit 44ae8187cd598d8111e28dd34f7403c1f8280a8f
diff --git a/3rd-party/prrte b/3rd-party/prrte
@@ -1 +1 @@
-Subproject commit 0c02993d6ff13c20eb6b3dd5f9c82cdff77bb4f9
+Subproject commit 78357dee102c6a3dd7ab21e5d854913a9cb0b89a
diff --git a/ompi/mca/pml/ob1/pml_ob1_recvfrag.c b/ompi/mca/pml/ob1/pml_ob1_recvfrag.c
@@ -521,7 +521,7 @@ void mca_pml_ob1_recv_frag_callback_rndv (mca_btl_base_module_t *btl,
     if( OPAL_UNLIKELY(segments->seg_len < sizeof(mca_pml_ob1_common_hdr_t)) ) {
         return;
     }
-    ob1_hdr_ntoh(hdr, MCA_PML_OB1_HDR_TYPE_RNDV);
+    ob1_hdr_ntoh((mca_pml_ob1_hdr_t*)hdr, MCA_PML_OB1_HDR_TYPE_RNDV);
     mca_pml_ob1_recv_frag_match(btl, &hdr->hdr_match, segments,
                                 descriptor->des_segment_count, MCA_PML_OB1_HDR_TYPE_RNDV);
 }
@@ -535,7 +535,7 @@ void mca_pml_ob1_recv_frag_callback_rget (mca_btl_base_module_t *btl,
     if( OPAL_UNLIKELY(segments->seg_len < sizeof(mca_pml_ob1_common_hdr_t)) ) {
         return;
     }
-    ob1_hdr_ntoh(hdr, MCA_PML_OB1_HDR_TYPE_RGET);
+    ob1_hdr_ntoh((mca_pml_ob1_hdr_t*)hdr, MCA_PML_OB1_HDR_TYPE_RGET);
     mca_pml_ob1_recv_frag_match(btl, &hdr->hdr_match, segments,
                                 descriptor->des_segment_count, MCA_PML_OB1_HDR_TYPE_RGET);
 }
@@ -552,7 +552,7 @@ void mca_pml_ob1_recv_frag_callback_ack (mca_btl_base_module_t *btl,
          return;
     }
 
-    ob1_hdr_ntoh(hdr, MCA_PML_OB1_HDR_TYPE_ACK);
+    ob1_hdr_ntoh((mca_pml_ob1_hdr_t*)hdr, MCA_PML_OB1_HDR_TYPE_ACK);
     sendreq = (mca_pml_ob1_send_request_t *) hdr->hdr_ack.hdr_src_req.pval;
     sendreq->req_recv = hdr->hdr_ack.hdr_dst_req;
 
@@ -614,7 +614,7 @@ void mca_pml_ob1_recv_frag_callback_frag (mca_btl_base_module_t *btl,
         return;
     }
 
-    ob1_hdr_ntoh(hdr, MCA_PML_OB1_HDR_TYPE_FRAG);
+    ob1_hdr_ntoh((mca_pml_ob1_hdr_t*)hdr, MCA_PML_OB1_HDR_TYPE_FRAG);
     recvreq = (mca_pml_ob1_recv_request_t*)hdr->hdr_frag.hdr_dst_req.pval;
 #if OPAL_CUDA_SUPPORT /* CUDA_ASYNC_RECV */
     /* If data is destined for GPU buffer and convertor was set up for asynchronous
@@ -648,7 +648,7 @@ void mca_pml_ob1_recv_frag_callback_put (mca_btl_base_module_t *btl,
         return;
     }
 
-    ob1_hdr_ntoh (hdr, MCA_PML_OB1_HDR_TYPE_PUT);
+    ob1_hdr_ntoh ((mca_pml_ob1_hdr_t*)hdr, MCA_PML_OB1_HDR_TYPE_PUT);
     sendreq = (mca_pml_ob1_send_request_t *) hdr->hdr_rdma.hdr_req.pval;
     mca_pml_ob1_send_request_put (sendreq, btl, &hdr->hdr_rdma);
 }

Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ void mca_pml_ob1_recv_frag_callback_rndv (mca_btl_base_module_t *btl,`
`521`	`521`	`if( OPAL_UNLIKELY(segments->seg_len < sizeof(mca_pml_ob1_common_hdr_t)) ) {`
`522`	`522`	`return;`
`523`	`523`	`}`
`524`		`- ob1_hdr_ntoh(hdr, MCA_PML_OB1_HDR_TYPE_RNDV);`
	`524`	`+ ob1_hdr_ntoh((mca_pml_ob1_hdr_t*)hdr, MCA_PML_OB1_HDR_TYPE_RNDV);`
`525`	`525`	`mca_pml_ob1_recv_frag_match(btl, &hdr->hdr_match, segments,`
`526`	`526`	`descriptor->des_segment_count, MCA_PML_OB1_HDR_TYPE_RNDV);`
`527`	`527`	`}`
`@@ -535,7 +535,7 @@ void mca_pml_ob1_recv_frag_callback_rget (mca_btl_base_module_t *btl,`
`535`	`535`	`if( OPAL_UNLIKELY(segments->seg_len < sizeof(mca_pml_ob1_common_hdr_t)) ) {`
`536`	`536`	`return;`
`537`	`537`	`}`
`538`		`- ob1_hdr_ntoh(hdr, MCA_PML_OB1_HDR_TYPE_RGET);`
	`538`	`+ ob1_hdr_ntoh((mca_pml_ob1_hdr_t*)hdr, MCA_PML_OB1_HDR_TYPE_RGET);`
`539`	`539`	`mca_pml_ob1_recv_frag_match(btl, &hdr->hdr_match, segments,`
`540`	`540`	`descriptor->des_segment_count, MCA_PML_OB1_HDR_TYPE_RGET);`
`541`	`541`	`}`
`@@ -552,7 +552,7 @@ void mca_pml_ob1_recv_frag_callback_ack (mca_btl_base_module_t *btl,`
`552`	`552`	`return;`
`553`	`553`	`}`
`554`	`554`
`555`		`- ob1_hdr_ntoh(hdr, MCA_PML_OB1_HDR_TYPE_ACK);`
	`555`	`+ ob1_hdr_ntoh((mca_pml_ob1_hdr_t*)hdr, MCA_PML_OB1_HDR_TYPE_ACK);`
`556`	`556`	`sendreq = (mca_pml_ob1_send_request_t *) hdr->hdr_ack.hdr_src_req.pval;`
`557`	`557`	`sendreq->req_recv = hdr->hdr_ack.hdr_dst_req;`
`558`	`558`
`@@ -614,7 +614,7 @@ void mca_pml_ob1_recv_frag_callback_frag (mca_btl_base_module_t *btl,`
`614`	`614`	`return;`
`615`	`615`	`}`
`616`	`616`
`617`		`- ob1_hdr_ntoh(hdr, MCA_PML_OB1_HDR_TYPE_FRAG);`
	`617`	`+ ob1_hdr_ntoh((mca_pml_ob1_hdr_t*)hdr, MCA_PML_OB1_HDR_TYPE_FRAG);`
`618`	`618`	`recvreq = (mca_pml_ob1_recv_request_t*)hdr->hdr_frag.hdr_dst_req.pval;`
`619`	`619`	`#if OPAL_CUDA_SUPPORT /* CUDA_ASYNC_RECV */`
`620`	`620`	`/* If data is destined for GPU buffer and convertor was set up for asynchronous`
`@@ -648,7 +648,7 @@ void mca_pml_ob1_recv_frag_callback_put (mca_btl_base_module_t *btl,`
`648`	`648`	`return;`
`649`	`649`	`}`
`650`	`650`
`651`		`- ob1_hdr_ntoh (hdr, MCA_PML_OB1_HDR_TYPE_PUT);`
	`651`	`+ ob1_hdr_ntoh ((mca_pml_ob1_hdr_t*)hdr, MCA_PML_OB1_HDR_TYPE_PUT);`
`652`	`652`	`sendreq = (mca_pml_ob1_send_request_t *) hdr->hdr_rdma.hdr_req.pval;`
`653`	`653`	`mca_pml_ob1_send_request_put (sendreq, btl, &hdr->hdr_rdma);`
`654`	`654`	`}`