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

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

diff --git a/include/babeltrace/graph/component-filter-const.h b/include/babeltrace/graph/component-filter-const.h
index 015ae22b7a174618747e3f2385fa10829b51bb5e..546761e375d5e0af1cb872afe21682714fda1b6c 100644 (file)
--- a/include/babeltrace/graph/component-filter-const.h
+++ b/include/babeltrace/graph/component-filter-const.h
@@ -2,10 +2,9 @@
 #define BABELTRACE_GRAPH_COMPONENT_FILTER_CONST_H
 
 /*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Author: Jérémie Galarneau <jeremie.galarneau@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
  * in the Software without restriction, including without limitation the rights
@@ -27,43 +26,63 @@
 
 #include <stdint.h>
 
+/*
+ * For bt_component, bt_component_filter, bt_port_input, bt_port_output,
+ * __BT_UPCAST_CONST
+ */
+#include <babeltrace/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_component;
-struct bt_component_filter;
-struct bt_port_input;
-struct bt_port_output;
-
 static inline
-const struct bt_component *bt_component_filter_as_component_const(
-               const struct bt_component_filter *component)
+const bt_component *bt_component_filter_as_component_const(
+               const bt_component_filter *component)
 {
-       return (const void *) component;
+       return __BT_UPCAST_CONST(bt_component, component);
 }
 
 extern uint64_t bt_component_filter_get_input_port_count(
-               const struct bt_component_filter *component);
+               const bt_component_filter *component);
 
-extern const struct bt_port_input *
+extern const bt_port_input *
 bt_component_filter_borrow_input_port_by_name_const(
-               const struct bt_component_filter *component, const char *name);
+               const bt_component_filter *component, const char *name);
 
-extern const struct bt_port_input *
+extern const bt_port_input *
 bt_component_filter_borrow_input_port_by_index_const(
-               const struct bt_component_filter *component, uint64_t index);
+               const bt_component_filter *component, uint64_t index);
 
 extern uint64_t bt_component_filter_get_output_port_count(
-               const struct bt_component_filter *component);
+               const bt_component_filter *component);
 
-extern const struct bt_port_output *
+extern const bt_port_output *
 bt_component_filter_borrow_output_port_by_name_const(
-               const struct bt_component_filter *component, const char *name);
+               const bt_component_filter *component, const char *name);
 
-extern const struct bt_port_output *
+extern const bt_port_output *
 bt_component_filter_borrow_output_port_by_index_const(
-               const struct bt_component_filter *component, uint64_t index);
+               const bt_component_filter *component, uint64_t index);
+
+extern void bt_component_filter_get_ref(
+               const bt_component_filter *component_filter);
+
+extern void bt_component_filter_put_ref(
+               const bt_component_filter *component_filter);
+
+#define BT_COMPONENT_FILTER_PUT_REF_AND_RESET(_var)            \
+       do {                                                    \
+               bt_component_filter_put_ref(_var);              \
+               (_var) = NULL;                                  \
+       } while (0)
+
+#define BT_COMPONENT_FILTER_MOVE_REF(_var_dst, _var_src)       \
+       do {                                                    \
+               bt_component_filter_put_ref(_var_dst);          \
+               (_var_dst) = (_var_src);                        \
+               (_var_src) = NULL;                              \
+       } while (0)
 
 #ifdef __cplusplus
 }