X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftypes.h;h=5b49f50cbb9f700d79f46328028f2e77a8c593f1;hb=9b4f9b425f2efce9a6ccc25f7ae062ebc1116a7d;hp=a8a8bb481160c4a689a7c698c823192fc795a813;hpb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;p=babeltrace.git

diff --git a/include/babeltrace2/types.h b/include/babeltrace2/types.h
index a8a8bb48..5b49f50c 100644
--- a/include/babeltrace2/types.h
+++ b/include/babeltrace2/types.h
@@ -2,7 +2,7 @@
 #define BABELTRACE2_TYPES_H
 
 /*
- * Copyright (c) 2017 Philippe Proulx <pproulx@efficios.com>
+ * Copyright (c) 2010-2019 EfficiOS Inc. and Linux Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -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
@@ -100,21 +91,29 @@ 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;