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

[babeltrace.git] / include / babeltrace / graph / self-component-port-input.h

diff --git a/include/babeltrace/graph/self-component-port-input.h b/include/babeltrace/graph/self-component-port-input.h
index ab8694b180dc793fa2a65750240aa5f35dad92a6..150499a2e14a3959efe59fdd0cc2040edbdcb5a0 100644 (file)
--- a/include/babeltrace/graph/self-component-port-input.h
+++ b/include/babeltrace/graph/self-component-port-input.h
@@ -23,12 +23,9 @@
  * SOFTWARE.
  */
 
-/* For enum bt_self_component_port_status */
-#include <babeltrace/graph/self-component-port.h>
-
 /*
  * For bt_port_input, bt_self_component_port,
- * bt_self_component_port_input
+ * bt_self_component_port_input, __BT_UPCAST, __BT_UPCAST_CONST
  */
 #include <babeltrace/types.h>
 
@@ -41,14 +38,14 @@ bt_self_component_port *
 bt_self_component_port_input_as_self_component_port(
                bt_self_component_port_input *self_component_port)
 {
-       return (void *) self_component_port;
+       return __BT_UPCAST(bt_self_component_port, self_component_port);
 }
 
 static inline
 const bt_port_input *bt_self_component_port_input_as_port_input(
                const bt_self_component_port_input *self_component_port)
 {
-       return (const void *) self_component_port;
+       return __BT_UPCAST_CONST(bt_port_input, self_component_port);
 }
 
 #ifdef __cplusplus