X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fbabeltrace.h;h=ce324694da86e1afc229b4233ba349fcf5e6dff0;hb=44e2e039eb4bea7100896f504f6e6a40b20b6a1e;hp=45509a8a1087c0251ea69fb0a7097520d8cbde28;hpb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;p=babeltrace.git
diff --git a/include/babeltrace2/babeltrace.h b/include/babeltrace2/babeltrace.h
index 45509a8a..ce324694 100644
--- a/include/babeltrace2/babeltrace.h
+++ b/include/babeltrace2/babeltrace.h
@@ -1,10 +1,8 @@
-#ifndef BABELTRACE_BABELTRACE_H
-#define BABELTRACE_BABELTRACE_H
+#ifndef BABELTRACE2_BABELTRACE_H
+#define BABELTRACE2_BABELTRACE_H
/*
- * Babeltrace API
- *
- * Copyright 2010-2018 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
@@ -25,7 +23,33 @@
* SOFTWARE.
*/
+/*
+ * Tell the specific headers that they are included from this header.
+ *
+ * Do NOT define `__BT_IN_BABELTRACE_H` in user code.
+ */
+#ifndef __BT_IN_BABELTRACE_H
+# define __BT_IN_BABELTRACE_H
+#endif
+
+/* 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
@@ -34,37 +58,6 @@
#include
#include
-/* Legacy API (for CTF writer) */
-#include
-
-/* CTF writer API */
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-/* Legacy API (for CTF writer) */
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
/* Trace IR API */
#include
#include
@@ -79,7 +72,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -90,12 +82,7 @@
#include
#include
-/* Plugin and plugin development API */
-#include
-#include
-#include
-
-/* Graph, component, and message API */
+/* Component class API */
#include
#include
#include
@@ -104,13 +91,30 @@
#include
#include
#include
+#include
+#include
+#include
+#include
+
+/* Component API */
#include
#include
#include
#include
-#include
-#include
-#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+/* Message iterator API */
+#include
+#include
+#include
+
+/* Message API */
#include
#include
#include
@@ -118,39 +122,63 @@
#include
#include
#include
-#include
#include
#include
#include
#include
#include
#include
-#include
-#include
-#include
-#include
-#include
#include
#include
+#include
#include
#include
+
+/* Graph API */
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
#include
#include
#include
-#include
+
+/* Query executor API */
+#include
#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#endif /* BABELTRACE_BABELTRACE_H */
+/* Plugin API */
+#include
+#include
+
+/* Plugin development */
+#include
+
+/* Cancel private definitions */
+#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_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 */