Merge pull request #3057 from hjelmn/osc_rdma_atomic

jsquyres · web-flow · commit 9ce3c7f150cc · 2017-02-28T06:15:30.000-05:00
osc/rdma: fix compile warning
diff --git a/ompi/mca/osc/rdma/osc_rdma.h b/ompi/mca/osc/rdma/osc_rdma.h
@@ -514,7 +514,7 @@ static inline void ompi_osc_rdma_aggregation_return (ompi_osc_rdma_aggregation_t
 
 
 __opal_attribute_always_inline__
-static bool ompi_osc_rdma_oor (int rc)
+static inline bool ompi_osc_rdma_oor (int rc)
 {
     /* check for OPAL_SUCCESS first to short-circuit the statement in the common case */
     return (OPAL_SUCCESS != rc && (OPAL_ERR_OUT_OF_RESOURCE == rc || OPAL_ERR_TEMP_OUT_OF_RESOURCE == rc));

Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,7 @@ static inline void ompi_osc_rdma_aggregation_return (ompi_osc_rdma_aggregation_t`
`514`	`514`
`515`	`515`
`516`	`516`	`__opal_attribute_always_inline__`
`517`		`-static bool ompi_osc_rdma_oor (int rc)`
	`517`	`+static inline bool ompi_osc_rdma_oor (int rc)`
`518`	`518`	`{`
`519`	`519`	`/* check for OPAL_SUCCESS first to short-circuit the statement in the common case */`
`520`	`520`	`return (OPAL_SUCCESS != rc && (OPAL_ERR_OUT_OF_RESOURCE == rc \|\| OPAL_ERR_TEMP_OUT_OF_RESOURCE == rc));`