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

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

diff --git a/include/babeltrace/graph/self-component-class-source.h b/include/babeltrace/graph/self-component-class-source.h
index 07bb19121251f026942106da54799acf64cac639..f78b4f78701369ebe178b36c52a80f3e47a2c037 100644 (file)
--- a/include/babeltrace/graph/self-component-class-source.h
+++ b/include/babeltrace/graph/self-component-class-source.h
@@ -24,19 +24,23 @@
  * SOFTWARE.
  */
 
+/*
+ * For bt_component_class_source, bt_self_component_class_source,
+ * __BT_UPCAST_CONST
+ */
+#include <babeltrace/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_component_class_source;
-struct bt_self_component_class_source;
-
 static inline
-const struct bt_component_class_source *
+const bt_component_class_source *
 bt_self_component_class_source_as_component_class_source(
-               struct bt_self_component_class_source *self_comp_cls_source)
+               bt_self_component_class_source *self_comp_cls_source)
 {
-       return (const void *) self_comp_cls_source;
+       return __BT_UPCAST_CONST(bt_component_class_source,
+               self_comp_cls_source);
 }
 
 #ifdef __cplusplus