[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-408-g1b68d68

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  1b68d685084037ff3b9061f9eaab38ca7459f9d7 (commit)
      from  f1193cd4b9302776cb983333e458b71729945e9f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/1b68d685084037ff3b9061f9eaab38ca7459f9d7

commit 1b68d685084037ff3b9061f9eaab38ca7459f9d7
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Mon Aug 29 16:57:41 2016 -0500

    CH4/Portals4: Fix compile issues
    
    No reviewer.

diff --git a/src/mpid/ch4/netmod/portals4/ptl_datatype.h b/src/mpid/ch4/netmod/portals4/ptl_datatype.h
index 679a48b..95f346a 100644
--- a/src/mpid/ch4/netmod/portals4/ptl_datatype.h
+++ b/src/mpid/ch4/netmod/portals4/ptl_datatype.h
@@ -11,12 +11,12 @@
 
 static inline int MPIDI_NM_type_free_hook(MPIR_Datatype * datatype_p)
 {
-    return;
+    return 0;
 }
 
 static inline int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p)
 {
-    return;
+    return 0;
 }
 
 static inline void MPIDI_NM_type_dup_hook(MPIR_Datatype * old_datatype_p,
diff --git a/src/mpid/ch4/netmod/portals4/ptl_progress.h b/src/mpid/ch4/netmod/portals4/ptl_progress.h
index 50163cb..5972225 100644
--- a/src/mpid/ch4/netmod/portals4/ptl_progress.h
+++ b/src/mpid/ch4/netmod/portals4/ptl_progress.h
@@ -29,7 +29,7 @@ static inline int MPIDI_PTL_am_handler(ptl_event_t * e)
     in_data = p_data = (e->start + (e->mlength - data_sz));
     int handler_id = e->hdr_data >> 56;
 
-    MPIDI_PTL_global.am_handlers[handler_id] (e->start,
+    MPIDI_PTL_global.am_handlers[handler_id] (handler_id, e->start,
                                               &p_data, &data_sz,
                                               &is_contig, &cmpl_handler_fn, &rreq);
 

-----------------------------------------------------------------------

Summary of changes:
 src/mpid/ch4/netmod/portals4/ptl_datatype.h |    4 ++--
 src/mpid/ch4/netmod/portals4/ptl_progress.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
MPICH primary repository