Fix: headers: make static inline upcasts compatible with C++

[babeltrace.git] / include / babeltrace / graph / self-component-sink.h

diff --git a/include/babeltrace/graph/self-component-sink.h b/include/babeltrace/graph/self-component-sink.h
index 720a9919b8390fe493db00b1557f4fb756bbdc07..04b8d206a19d639582f0f918175415eaf7ba9735 100644 (file)
--- a/include/babeltrace/graph/self-component-sink.h
+++ b/include/babeltrace/graph/self-component-sink.h
@@ -25,12 +25,12 @@
 
 #include <stdint.h>
 
-/* For enum bt_self_component_status */
+/* For bt_self_component_status */
 #include <babeltrace/graph/self-component.h>
 
 /*
  * For bt_component_sink, bt_self_component, bt_self_component_sink,
- * bt_self_component_port_input
+ * bt_self_component_port_input, __BT_UPCAST, __BT_UPCAST_CONST
  */
 #include <babeltrace/types.h>
 
@@ -42,7 +42,7 @@ static inline
 bt_self_component *bt_self_component_sink_as_self_component(
                bt_self_component_sink *self_comp_sink)
 {
-       return (void *) self_comp_sink;
+       return __BT_UPCAST(bt_self_component, self_comp_sink);
 }
 
 static inline
@@ -50,7 +50,7 @@ const bt_component_sink *
 bt_self_component_sink_as_component_sink(
                bt_self_component_sink *self_comp_sink)
 {
-       return (const void *) self_comp_sink;
+       return __BT_UPCAST_CONST(bt_component_sink, self_comp_sink);
 }
 
 extern bt_self_component_port_input *
@@ -62,7 +62,7 @@ extern bt_self_component_port_input *
 bt_self_component_sink_borrow_input_port_by_index(
                bt_self_component_sink *self_component, uint64_t index);
 
-extern enum bt_self_component_status
+extern bt_self_component_status
 bt_self_component_sink_add_input_port(
                bt_self_component_sink *self_component,
                const char *name, void *user_data,