osc/pt2pt: silence misc warnings

(cherry picked from commit open-mpi/ompi@8faa1ed)

Signed-off-by: Nathan Hjelm <[email protected]>

Author: ggouaillardet

ompi/mca/osc/pt2pt/osc_pt2pt.h

@@ -12,7 +12,7 @@
  *                         reserved.
  * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2012-2013 Sandia National Laboratories.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016      FUJITSU LIMITED.  All rights reserved.
  * $COPYRIGHT$
@@ -151,17 +151,17 @@ static inline void ompi_osc_pt2pt_peer_set_flag (ompi_osc_pt2pt_peer_t *peer, in
     }
 }
 
-static inline bool ompi_osc_pt2pt_peer_set_locked (ompi_osc_pt2pt_peer_t *peer, bool value)
+static inline void ompi_osc_pt2pt_peer_set_locked (ompi_osc_pt2pt_peer_t *peer, bool value)
 {
     ompi_osc_pt2pt_peer_set_flag (peer, OMPI_OSC_PT2PT_PEER_FLAG_LOCK, value);
 }
 
-static inline bool ompi_osc_pt2pt_peer_set_unex (ompi_osc_pt2pt_peer_t *peer, bool value)
+static inline void ompi_osc_pt2pt_peer_set_unex (ompi_osc_pt2pt_peer_t *peer, bool value)
 {
     ompi_osc_pt2pt_peer_set_flag (peer, OMPI_OSC_PT2PT_PEER_FLAG_UNEX, value);
 }
 
-static inline bool ompi_osc_pt2pt_peer_set_eager_active (ompi_osc_pt2pt_peer_t *peer, bool value)
+static inline void ompi_osc_pt2pt_peer_set_eager_active (ompi_osc_pt2pt_peer_t *peer, bool value)
 {
     ompi_osc_pt2pt_peer_set_flag (peer, OMPI_OSC_PT2PT_PEER_FLAG_EAGER, value);
 }

ompi/mca/osc/pt2pt/osc_pt2pt_component.c

@@ -14,7 +14,7 @@
  * Copyright (c) 2006-2008 University of Houston.  All rights reserved.
  * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
  * Copyright (c) 2012-2013 Sandia National Laboratories.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -466,13 +466,13 @@ ompi_osc_pt2pt_get_info(struct ompi_win_t *win, struct ompi_info_t **info_used)
 
 OBJ_CLASS_INSTANCE(ompi_osc_pt2pt_pending_t, opal_list_item_t, NULL, NULL);
 
-void ompi_osc_pt2pt_receive_construct (ompi_osc_pt2pt_receive_t *recv)
+static void ompi_osc_pt2pt_receive_construct (ompi_osc_pt2pt_receive_t *recv)
 {
     recv->buffer = NULL;
     recv->pml_request = NULL;
 }
 
-void ompi_osc_pt2pt_receive_destruct (ompi_osc_pt2pt_receive_t *recv)
+static void ompi_osc_pt2pt_receive_destruct (ompi_osc_pt2pt_receive_t *recv)
 {
     free (recv->buffer);
     if (recv->pml_request && MPI_REQUEST_NULL != recv->pml_request) {

ompi/mca/osc/pt2pt/osc_pt2pt_passive_target.c

@@ -13,7 +13,7 @@
  * Copyright (c) 2010      IBM Corporation.  All rights reserved.
  * Copyright (c) 2012-2013 Sandia National Laboratories.  All rights reserved.
  * Copyright (c) 2015      Intel, Inc. All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -324,7 +324,7 @@ static int ompi_osc_pt2pt_lock_internal (int lock_type, int target, int assert,
     lock->sync.lock.target = target;
     lock->sync.lock.type = lock_type;
     lock->sync.lock.assert = assert;
-    lock->num_peers = (-1 == target) ? ompi_comm_size (&module->comm) : 1;
+    lock->num_peers = (-1 == target) ? ompi_comm_size (module->comm) : 1;
     lock->sync_expected = 0;
 
     /* delay all eager sends until we've heard back.. */