Add explicit casts in ilist.h's inline functions.

tglsfdc · tglsfdc · commit e78d288c895b · 2012-11-27T10:58:37.000-05:00
Needed to silence C++ errors, per report from Peter Eisentraut.

Andres Freund
diff --git a/src/include/lib/ilist.h b/src/include/lib/ilist.h
@@ -467,7 +467,7 @@ dlist_head_element_off(dlist_head *head, size_t off)
 STATIC_IF_INLINE dlist_node *
 dlist_head_node(dlist_head *head)
 {
-	return dlist_head_element_off(head, 0);
+	return (dlist_node *) dlist_head_element_off(head, 0);
 }
 
 /* internal support function to get address of tail element's struct */
@@ -484,7 +484,7 @@ dlist_tail_element_off(dlist_head *head, size_t off)
 STATIC_IF_INLINE dlist_node *
 dlist_tail_node(dlist_head *head)
 {
-	return dlist_tail_element_off(head, 0);
+	return (dlist_node *) dlist_tail_element_off(head, 0);
 }
 #endif   /* PG_USE_INLINE || ILIST_INCLUDE_DEFINITIONS */
 
@@ -677,7 +677,7 @@ slist_head_element_off(slist_head *head, size_t off)
 STATIC_IF_INLINE slist_node *
 slist_head_node(slist_head *head)
 {
-	return slist_head_element_off(head, 0);
+	return (slist_node *) slist_head_element_off(head, 0);
 }
 #endif   /* PG_USE_INLINE || ILIST_INCLUDE_DEFINITIONS */
 

Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ dlist_head_element_off(dlist_head *head, size_t off)`
`467`	`467`	`STATIC_IF_INLINE dlist_node *`
`468`	`468`	`dlist_head_node(dlist_head *head)`
`469`	`469`	`{`
`470`		`- return dlist_head_element_off(head, 0);`
	`470`	`+ return (dlist_node *) dlist_head_element_off(head, 0);`
`471`	`471`	`}`
`472`	`472`
`473`	`473`	`/* internal support function to get address of tail element's struct */`
`@@ -484,7 +484,7 @@ dlist_tail_element_off(dlist_head *head, size_t off)`
`484`	`484`	`STATIC_IF_INLINE dlist_node *`
`485`	`485`	`dlist_tail_node(dlist_head *head)`
`486`	`486`	`{`
`487`		`- return dlist_tail_element_off(head, 0);`
	`487`	`+ return (dlist_node *) dlist_tail_element_off(head, 0);`
`488`	`488`	`}`
`489`	`489`	`#endif /* PG_USE_INLINE \|\| ILIST_INCLUDE_DEFINITIONS */`
`490`	`490`
`@@ -677,7 +677,7 @@ slist_head_element_off(slist_head *head, size_t off)`
`677`	`677`	`STATIC_IF_INLINE slist_node *`
`678`	`678`	`slist_head_node(slist_head *head)`
`679`	`679`	`{`
`680`		`- return slist_head_element_off(head, 0);`
	`680`	`+ return (slist_node *) slist_head_element_off(head, 0);`
`681`	`681`	`}`
`682`	`682`	`#endif /* PG_USE_INLINE \|\| ILIST_INCLUDE_DEFINITIONS */`
`683`	`683`