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

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

diff --git a/include/babeltrace/graph/self-component-class-filter.h b/include/babeltrace/graph/self-component-class-filter.h
index a171821e6e9bce136bdbb9a0b03020c67c1da41a..1ff7b391cda247bfc032629b55ff7b74a8a637e6 100644 (file)
--- a/include/babeltrace/graph/self-component-class-filter.h
+++ b/include/babeltrace/graph/self-component-class-filter.h
@@ -24,19 +24,23 @@
  * SOFTWARE.
  */
 
+/*
+ * For bt_component_class_filter, bt_self_component_class_filter,
+ * __BT_UPCAST_CONST
+ */
+#include <babeltrace/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_component_class_filter;
-struct bt_self_component_class_filter;
-
 static inline
-const struct bt_component_class_filter *
+const bt_component_class_filter *
 bt_self_component_class_filter_as_component_class_filter(
-               struct bt_self_component_class_filter *self_comp_cls_filter)
+               bt_self_component_class_filter *self_comp_cls_filter)
 {
-       return (const void *) self_comp_cls_filter;
+       return __BT_UPCAST_CONST(bt_component_class_filter,
+               self_comp_cls_filter);
 }
 
 #ifdef __cplusplus