X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fbabeltrace.h;h=ce324694da86e1afc229b4233ba349fcf5e6dff0;hb=c513d2401e36d61f007fee2c8cc12c306fdd6a3c;hp=11eab6b6b0a44169e41eca4f9353095d654987aa;hpb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;p=babeltrace.git
diff --git a/include/babeltrace2/babeltrace.h b/include/babeltrace2/babeltrace.h
index 11eab6b6..ce324694 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.
+ * 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
+/* Internal: needed by some of the following included headers */
+#ifdef __cplusplus
+# define __BT_UPCAST(_type, _p) static_cast<_type *>(static_cast(_p))
+# define __BT_UPCAST_CONST(_type, _p) static_cast(static_cast(_p))
+#else
+# define __BT_UPCAST(_type, _p) ((_type *) (_p))
+# define __BT_UPCAST_CONST(_type, _p) ((const _type *) (_p))
+#endif
+
/* Core API */
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -63,7 +72,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -86,6 +94,7 @@
#include
#include
#include
+#include
/* Component API */
#include
@@ -102,7 +111,6 @@
/* Message iterator API */
#include
-#include
#include
#include
@@ -127,14 +135,20 @@
#include
/* Graph API */
+#include
+#include
#include
#include
#include
+#include
+#include
+#include
#include
#include
#include
/* Query executor API */
+#include
#include
#include
@@ -146,18 +160,25 @@
#include
/* Cancel private definitions */
-#undef __BT_FUNC_STATUS_OVERFLOW
-#undef __BT_FUNC_STATUS_INVALID_PARAMS
-#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_AGAIN
#undef __BT_FUNC_STATUS_END
+#undef __BT_FUNC_STATUS_ERROR
+#undef __BT_FUNC_STATUS_INTERRUPTED
+#undef __BT_FUNC_STATUS_UNKNOWN_OBJECT
+#undef __BT_FUNC_STATUS_MEMORY_ERROR
#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_FUNC_STATUS_USER_ERROR
#undef __BT_IN_BABELTRACE_H
+#undef __BT_UPCAST
+#undef __BT_UPCAST_CONST
+#undef __BT_LOGGING_LEVEL_TRACE
+#undef __BT_LOGGING_LEVEL_DEBUG
+#undef __BT_LOGGING_LEVEL_INFO
+#undef __BT_LOGGING_LEVEL_WARNING
+#undef __BT_LOGGING_LEVEL_ERROR
+#undef __BT_LOGGING_LEVEL_FATAL
+#undef __BT_LOGGING_LEVEL_NONE
#endif /* BABELTRACE2_BABELTRACE_H */