X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fbabeltrace.h;h=3b7bb7538f79722e5784337d5eb6588e803c2598;hb=520cdc8260ea033f1c9f54b87d93fcb034ae8472;hp=11eab6b6b0a44169e41eca4f9353095d654987aa;hpb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;p=babeltrace.git

diff --git a/include/babeltrace2/babeltrace.h b/include/babeltrace2/babeltrace.h
index 11eab6b6..3b7bb753 100644
--- a/include/babeltrace2/babeltrace.h
+++ b/include/babeltrace2/babeltrace.h
@@ -2,9 +2,7 @@
 #define BABELTRACE2_BABELTRACE_H
 
 /*
- * Babeltrace API
- *
- * Copyright 2010-2019 EfficiOS Inc. <http://www.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
@@ -34,13 +32,24 @@
 # define __BT_IN_BABELTRACE_H
 #endif
 
-/* Need by some of the following included headers */
+/* Internal: needed by some of the following included headers */
 #include <babeltrace2/func-status.h>
 
+/* Internal: needed by some of the following included headers */
+#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
+
 /* Core API */
 #include <babeltrace2/current-thread.h>
 #include <babeltrace2/error-cause-const.h>
 #include <babeltrace2/error-const.h>
+#include <babeltrace2/integer-range-set-const.h>
+#include <babeltrace2/integer-range-set.h>
 #include <babeltrace2/logging.h>
 #include <babeltrace2/property.h>
 #include <babeltrace2/types.h>
@@ -130,6 +139,8 @@
 #include <babeltrace2/graph/connection-const.h>
 #include <babeltrace2/graph/graph-const.h>
 #include <babeltrace2/graph/graph.h>
+#include <babeltrace2/graph/interrupter-const.h>
+#include <babeltrace2/graph/interrupter.h>
 #include <babeltrace2/graph/port-const.h>
 #include <babeltrace2/graph/port-input-const.h>
 #include <babeltrace2/graph/port-output-const.h>
@@ -146,18 +157,17 @@
 #include <babeltrace2/plugin/plugin-dev.h>
 
 /* Cancel private definitions */
-#undef __BT_FUNC_STATUS_OVERFLOW
-#undef __BT_FUNC_STATUS_INVALID_PARAMS
+#undef __BT_FUNC_STATUS_AGAIN
+#undef __BT_FUNC_STATUS_END
+#undef __BT_FUNC_STATUS_ERROR
+#undef __BT_FUNC_STATUS_INTERRUPTED
 #undef __BT_FUNC_STATUS_INVALID_OBJECT
 #undef __BT_FUNC_STATUS_MEMORY_ERROR
-#undef __BT_FUNC_STATUS_LOADING_ERROR
-#undef __BT_FUNC_STATUS_ERROR
-#undef __BT_FUNC_STATUS_OK
-#undef __BT_FUNC_STATUS_END
 #undef __BT_FUNC_STATUS_NOT_FOUND
-#undef __BT_FUNC_STATUS_AGAIN
-#undef __BT_FUNC_STATUS_UNSUPPORTED
-#undef __BT_FUNC_STATUS_CANCELED
+#undef __BT_FUNC_STATUS_OK
+#undef __BT_FUNC_STATUS_OVERFLOW_ERROR
 #undef __BT_IN_BABELTRACE_H
+#undef __BT_UPCAST
+#undef __BT_UPCAST_CONST
 
 #endif /* BABELTRACE2_BABELTRACE_H */