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

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

diff --git a/include/babeltrace/graph/component-class-filter-const.h b/include/babeltrace/graph/component-class-filter-const.h
index 3fa6dca031b690b0bb320b2f3d84fddb14ce5d14..7b11819d3ea31c43b1637925e391564890582185 100644 (file)
--- a/include/babeltrace/graph/component-class-filter-const.h
+++ b/include/babeltrace/graph/component-class-filter-const.h
@@ -24,26 +24,29 @@
  * SOFTWARE.
  */
 
+/*
+ * For bt_component_class, bt_component_class_filter,
+ * __BT_UPCAST_CONST
+ */
+#include <babeltrace/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_component_class;
-struct bt_component_class_filter;
-
 static inline
-const struct bt_component_class *
+const bt_component_class *
 bt_component_class_filter_as_component_class_const(
-               const struct bt_component_class_filter *comp_cls_filter)
+               const bt_component_class_filter *comp_cls_filter)
 {
-       return (const void *) comp_cls_filter;
+       return __BT_UPCAST_CONST(bt_component_class, comp_cls_filter);
 }
 
 extern void bt_component_class_filter_get_ref(
-               const struct bt_component_class_filter *component_class_filter);
+               const bt_component_class_filter *component_class_filter);
 
 extern void bt_component_class_filter_put_ref(
-               const struct bt_component_class_filter *component_class_filter);
+               const bt_component_class_filter *component_class_filter);
 
 #define BT_COMPONENT_CLASS_FILTER_PUT_REF_AND_RESET(_var)      \
        do {                                                    \