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

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

diff --git a/include/babeltrace/graph/component-class-sink-const.h b/include/babeltrace/graph/component-class-sink-const.h
index d862221a3fb52bc766ad591b7d4156e746526f4d..fd49c6df80eff4f9e714bdb45d815252f93bc297 100644 (file)
--- a/include/babeltrace/graph/component-class-sink-const.h
+++ b/include/babeltrace/graph/component-class-sink-const.h
@@ -2,6 +2,7 @@
 #define BABELTRACE_GRAPH_COMPONENT_CLASS_SINK_CONST_H
 
 /*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -23,21 +24,40 @@
  * SOFTWARE.
  */
 
+/* For bt_component_class, bt_component_class_sink, __BT_UPCAST_CONST */
+#include <babeltrace/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_component_class;
-struct bt_component_class_sink;
-
 static inline
-const struct bt_component_class *
+const bt_component_class *
 bt_component_class_sink_as_component_class_const(
-               const struct bt_component_class_sink *comp_cls_sink)
+               const bt_component_class_sink *comp_cls_sink)
 {
-       return (const void *) comp_cls_sink;
+       return __BT_UPCAST_CONST(bt_component_class, comp_cls_sink);
 }
 
+extern void bt_component_class_sink_get_ref(
+               const bt_component_class_sink *component_class_sink);
+
+extern void bt_component_class_sink_put_ref(
+               const bt_component_class_sink *component_class_sink);
+
+#define BT_COMPONENT_CLASS_SINK_PUT_REF_AND_RESET(_var)                \
+       do {                                                    \
+               bt_component_class_sink_put_ref(_var);          \
+               (_var) = NULL;                                  \
+       } while (0)
+
+#define BT_COMPONENT_CLASS_SINK_MOVE_REF(_var_dst, _var_src)   \
+       do {                                                    \
+               bt_component_class_sink_put_ref(_var_dst);      \
+               (_var_dst) = (_var_src);                        \
+               (_var_src) = NULL;                              \
+       } while (0)
+
 #ifdef __cplusplus
 }
 #endif