X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftypes.h;h=55fba0edfbefaf7eba286b89321baa619ed3640d;hb=c6fe8c4012c19ba7ab7fc16853a464e0381d6290;hp=9808ec1d00db21439f7b2d159442f4def5acbc92;hpb=bbb7b5f044dc06e50eaa34ed3a880b34e1e7ebb8;p=babeltrace.git

diff --git a/include/babeltrace2/types.h b/include/babeltrace2/types.h
index 9808ec1d..55fba0ed 100644
--- a/include/babeltrace2/types.h
+++ b/include/babeltrace2/types.h
@@ -29,15 +29,6 @@
 
 #include <stdint.h>
 
-/* Internal use */
-#ifdef __cplusplus
-# define __BT_UPCAST(_type, _p)		static_cast<_type *>(static_cast<void *>(_p))
-# define __BT_UPCAST_CONST(_type, _p)	static_cast<const _type *>(static_cast<const void *>(_p))
-#else
-# define __BT_UPCAST(_type, _p)		((_type *) (_p))
-# define __BT_UPCAST_CONST(_type, _p)	((const _type *) (_p))
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -87,6 +78,8 @@ if (ret) {
 */
 typedef int bt_bool;
 
+typedef uint64_t bt_listener_id;
+
 typedef const uint8_t *bt_uuid;
 
 typedef struct bt_clock_class bt_clock_class;
@@ -96,25 +89,34 @@ typedef struct bt_component_class bt_component_class;
 typedef struct bt_component_class_filter bt_component_class_filter;
 typedef struct bt_component_class_sink bt_component_class_sink;
 typedef struct bt_component_class_source bt_component_class_source;
+typedef struct bt_component_descriptor_set bt_component_descriptor_set;
 typedef struct bt_component_filter bt_component_filter;
 typedef struct bt_component_sink bt_component_sink;
 typedef struct bt_component_source bt_component_source;
 typedef struct bt_connection bt_connection;
+typedef struct bt_error bt_error;
+typedef struct bt_error_cause bt_error_cause;
 typedef struct bt_event bt_event;
 typedef struct bt_event_class bt_event_class;
 typedef struct bt_event_header_field bt_event_header_field;
-typedef struct bt_error bt_error;
-typedef struct bt_error_cause bt_error_cause;
 typedef struct bt_field bt_field;
 typedef struct bt_field_class bt_field_class;
 typedef struct bt_field_class_enumeration_mapping bt_field_class_enumeration_mapping;
-typedef struct bt_field_class_signed_enumeration_mapping bt_field_class_signed_enumeration_mapping;
-typedef struct bt_field_class_unsigned_enumeration_mapping bt_field_class_unsigned_enumeration_mapping;
+typedef struct bt_field_class_enumeration_signed_mapping bt_field_class_enumeration_signed_mapping;
+typedef struct bt_field_class_enumeration_unsigned_mapping bt_field_class_enumeration_unsigned_mapping;
 typedef struct bt_field_class_structure_member bt_field_class_structure_member;
 typedef struct bt_field_class_variant_option bt_field_class_variant_option;
+typedef struct bt_field_class_variant_with_selector_signed_option bt_field_class_variant_with_selector_signed_option;
+typedef struct bt_field_class_variant_with_selector_unsigned_option bt_field_class_variant_with_selector_unsigned_option;
 typedef struct bt_field_path bt_field_path;
 typedef struct bt_field_path_item bt_field_path_item;
 typedef struct bt_graph bt_graph;
+typedef struct bt_integer_range_set bt_integer_range_set;
+typedef struct bt_integer_range_set_signed bt_integer_range_set_signed;
+typedef struct bt_integer_range_set_unsigned bt_integer_range_set_unsigned;
+typedef struct bt_integer_range_signed bt_integer_range_signed;
+typedef struct bt_integer_range_unsigned bt_integer_range_unsigned;
+typedef struct bt_interrupter bt_interrupter;
 typedef struct bt_message bt_message;
 typedef struct bt_message_iterator bt_message_iterator;
 typedef struct bt_object bt_object;
@@ -128,6 +130,7 @@ typedef struct bt_port bt_port;
 typedef struct bt_port_input bt_port_input;
 typedef struct bt_port_output bt_port_output;
 typedef struct bt_port_output_message_iterator bt_port_output_message_iterator;
+typedef struct bt_private_query_executor bt_private_query_executor;
 typedef struct bt_query_executor bt_query_executor;
 typedef struct bt_self_component bt_self_component;
 typedef struct bt_self_component_class bt_self_component_class;