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

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

diff --git a/include/babeltrace/graph/component-class-sink.h b/include/babeltrace/graph/component-class-sink.h
index 3ad4d285106d2a56d51f375e4eeb890565c0c3e9..a34dcfd6ea4379b0b67f1cfac8fb80fd09daa5e0 100644 (file)
--- a/include/babeltrace/graph/component-class-sink.h
+++ b/include/babeltrace/graph/component-class-sink.h
@@ -38,7 +38,8 @@
 /*
  * For bt_component_class, bt_component_class_sink, bt_port_output,
  * bt_query_executor, bt_self_component_class_sink,
- * bt_self_component_sink, bt_self_component_port_input, bt_value
+ * bt_self_component_sink, bt_self_component_port_input, bt_value,
+ * __BT_UPCAST
  */
 #include <babeltrace/types.h>
 
@@ -72,10 +73,9 @@ typedef bt_self_component_status
                bt_self_component_port_input *self_port,
                const bt_port_output *other_port);
 
-typedef void
-(*bt_component_class_sink_input_port_disconnected_method)(
-               bt_self_component_sink *self_component,
-               bt_self_component_port_input *self_port);
+typedef bt_self_component_status
+(*bt_component_class_sink_graph_is_configured_method)(
+               bt_self_component_sink *self_component);
 
 typedef bt_self_component_status (*bt_component_class_sink_consume_method)(
        bt_self_component_sink *self_component);
@@ -84,7 +84,7 @@ static inline
 bt_component_class *bt_component_class_sink_as_component_class(
                bt_component_class_sink *comp_cls_sink)
 {
-       return (void *) comp_cls_sink;
+       return __BT_UPCAST(bt_component_class, comp_cls_sink);
 }
 
 extern
@@ -111,9 +111,9 @@ bt_component_class_sink_set_input_port_connected_method(
                bt_component_class_sink_input_port_connected_method method);
 
 extern bt_component_class_status
-bt_component_class_sink_set_input_port_disconnected_method(
+bt_component_class_sink_set_graph_is_configured_method(
                bt_component_class_sink *comp_class,
-               bt_component_class_sink_input_port_disconnected_method method);
+               bt_component_class_sink_graph_is_configured_method method);
 
 extern bt_component_class_status bt_component_class_sink_set_query_method(
                bt_component_class_sink *comp_class,