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

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

diff --git a/include/babeltrace/graph/component-class-filter.h b/include/babeltrace/graph/component-class-filter.h
index 56d0443717cd4015fd2f9b38aec512ee14eca2c3..2e8f472e6632c84c34763f9b851a64f0847a8a0e 100644 (file)
--- a/include/babeltrace/graph/component-class-filter.h
+++ b/include/babeltrace/graph/component-class-filter.h
@@ -35,11 +35,15 @@
 /* For bt_query_status */
 #include <babeltrace/graph/component-class.h>
 
+/* For bt_component_class_status */
+#include <babeltrace/graph/component-class-const.h>
+
 /*
  * For bt_component_class, bt_component_class_filter, bt_port_input,
  * bt_port_output, bt_query_executor, bt_self_component_class_filter,
  * bt_self_component_filter, bt_self_component_port_input,
- * bt_self_component_port_output, bt_value, bt_message_array_const
+ * bt_self_component_port_output, bt_value, bt_message_array_const,
+ * bt_bool, bt_self_message_iterator, __BT_UPCAST
  */
 #include <babeltrace/types.h>
 
@@ -71,6 +75,24 @@ typedef bt_self_message_iterator_status
                bt_message_array_const msgs, uint64_t capacity,
                uint64_t *count);
 
+typedef bt_self_message_iterator_status
+(*bt_component_class_filter_message_iterator_seek_ns_from_origin_method)(
+               bt_self_message_iterator *message_iterator,
+               int64_t ns_from_origin);
+
+typedef bt_self_message_iterator_status
+(*bt_component_class_filter_message_iterator_seek_beginning_method)(
+               bt_self_message_iterator *message_iterator);
+
+typedef bt_bool
+(*bt_component_class_filter_message_iterator_can_seek_ns_from_origin_method)(
+               bt_self_message_iterator *message_iterator,
+               int64_t ns_from_origin);
+
+typedef bt_bool
+(*bt_component_class_filter_message_iterator_can_seek_beginning_method)(
+               bt_self_message_iterator *message_iterator);
+
 typedef bt_query_status
 (*bt_component_class_filter_query_method)(
                bt_self_component_class_filter *comp_class,
@@ -102,21 +124,11 @@ typedef bt_self_component_status
                bt_self_component_port_output *self_port,
                const bt_port_input *other_port);
 
-typedef void
-(*bt_component_class_filter_input_port_disconnected_method)(
-               bt_self_component_filter *self_component,
-               bt_self_component_port_input *self_port);
-
-typedef void
-(*bt_component_class_filter_output_port_disconnected_method)(
-               bt_self_component_filter *self_component,
-               bt_self_component_port_output *self_port);
-
 static inline
 bt_component_class *bt_component_class_filter_as_component_class(
                bt_component_class_filter *comp_cls_filter)
 {
-       return (void *) comp_cls_filter;
+       return __BT_UPCAST(bt_component_class, comp_cls_filter);
 }
 
 extern
@@ -124,49 +136,70 @@ bt_component_class_filter *bt_component_class_filter_create(
                const char *name,
                bt_component_class_filter_message_iterator_next_method method);
 
-extern int bt_component_class_filter_set_init_method(
+extern bt_component_class_status
+bt_component_class_filter_set_init_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_init_method method);
 
-extern int bt_component_class_filter_set_finalize_method(
+extern bt_component_class_status
+bt_component_class_filter_set_finalize_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_finalize_method method);
 
-extern int bt_component_class_filter_set_accept_input_port_connection_method(
+extern bt_component_class_status
+bt_component_class_filter_set_accept_input_port_connection_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_accept_input_port_connection_method method);
 
-extern int bt_component_class_filter_set_accept_output_port_connection_method(
+extern bt_component_class_status
+bt_component_class_filter_set_accept_output_port_connection_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_accept_output_port_connection_method method);
 
-extern int bt_component_class_filter_set_input_port_connected_method(
+extern bt_component_class_status
+bt_component_class_filter_set_input_port_connected_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_input_port_connected_method method);
 
-extern int bt_component_class_filter_set_output_port_connected_method(
+extern bt_component_class_status
+bt_component_class_filter_set_output_port_connected_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_output_port_connected_method method);
 
-extern int bt_component_class_filter_set_input_port_disconnected_method(
+extern bt_component_class_status
+bt_component_class_filter_set_query_method(
                bt_component_class_filter *comp_class,
-               bt_component_class_filter_input_port_disconnected_method method);
+               bt_component_class_filter_query_method method);
 
-extern int bt_component_class_filter_set_output_port_disconnected_method(
+extern bt_component_class_status
+bt_component_class_filter_set_message_iterator_init_method(
                bt_component_class_filter *comp_class,
-               bt_component_class_filter_output_port_disconnected_method method);
+               bt_component_class_filter_message_iterator_init_method method);
 
-extern int bt_component_class_filter_set_query_method(
+extern bt_component_class_status
+bt_component_class_filter_set_message_iterator_finalize_method(
                bt_component_class_filter *comp_class,
-               bt_component_class_filter_query_method method);
+               bt_component_class_filter_message_iterator_finalize_method method);
 
-extern int bt_component_class_filter_set_message_iterator_init_method(
+extern bt_component_class_status
+bt_component_class_filter_set_message_iterator_seek_ns_from_origin_method(
                bt_component_class_filter *comp_class,
-               bt_component_class_filter_message_iterator_init_method method);
+               bt_component_class_filter_message_iterator_seek_ns_from_origin_method method);
 
-extern int bt_component_class_filter_set_message_iterator_finalize_method(
+extern bt_component_class_status
+bt_component_class_filter_set_message_iterator_seek_beginning_method(
                bt_component_class_filter *comp_class,
-               bt_component_class_filter_message_iterator_finalize_method method);
+               bt_component_class_filter_message_iterator_seek_beginning_method method);
+
+extern bt_bool
+bt_component_class_filter_set_message_iterator_can_seek_ns_from_origin_method(
+               bt_component_class_filter *comp_class,
+               bt_component_class_filter_message_iterator_can_seek_ns_from_origin_method method);
+
+extern bt_bool
+bt_component_class_filter_set_message_iterator_can_seek_beginning_method(
+               bt_component_class_filter *comp_class,
+               bt_component_class_filter_message_iterator_can_seek_beginning_method method);
 
 #ifdef __cplusplus
 }