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

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

diff --git a/include/babeltrace/graph/self-component-port-output.h b/include/babeltrace/graph/self-component-port-output.h
index 23801ff20e12b49d73ecb800ee9cc1ae88d84c95..fee38aa84cc58211fadb4fed4da15f98c61302a6 100644 (file)
--- a/include/babeltrace/graph/self-component-port-output.h
+++ b/include/babeltrace/graph/self-component-port-output.h
@@ -2,7 +2,7 @@
 #define BABELTRACE_GRAPH_SELF_COMPONENT_PORT_OUTPUT_H
 
 /*
- * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,30 +23,29 @@
  * SOFTWARE.
  */
 
-/* For enum bt_self_component_port_status */
-#include <babeltrace/graph/self-component-port.h>
+/*
+ * For bt_port_output, bt_self_component_port,
+ * bt_self_component_port_output, __BT_UPCAST, __BT_UPCAST_CONST
+ */
+#include <babeltrace/types.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_port_output;
-struct bt_self_component_port;
-struct bt_self_component_port_output;
-
 static inline
-struct bt_self_component_port *
+bt_self_component_port *
 bt_self_component_port_output_as_self_component_port(
-               struct bt_self_component_port_output *self_component_port)
+               bt_self_component_port_output *self_component_port)
 {
-       return (void *) self_component_port;
+       return __BT_UPCAST(bt_self_component_port, self_component_port);
 }
 
 static inline
-const struct bt_port_output *bt_self_component_port_output_as_port_output(
-               struct bt_self_component_port_output *self_component_port)
+const bt_port_output *bt_self_component_port_output_as_port_output(
+               bt_self_component_port_output *self_component_port)
 {
-       return (const void *) self_component_port;
+       return __BT_UPCAST_CONST(bt_port_output, self_component_port);
 }
 
 #ifdef __cplusplus