X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fbabeltrace.h;h=ce324694da86e1afc229b4233ba349fcf5e6dff0;hb=c513d2401e36d61f007fee2c8cc12c306fdd6a3c;hp=b9ce9847ad191a8488758d26e81e4eed52538175;hpb=06b2c29428b48f3c12564b5c26590d11f7482a97;p=babeltrace.git

diff --git a/include/babeltrace2/babeltrace.h b/include/babeltrace2/babeltrace.h
index b9ce9847..ce324694 100644
--- a/include/babeltrace2/babeltrace.h
+++ b/include/babeltrace2/babeltrace.h
@@ -48,6 +48,8 @@
 #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>
@@ -70,7 +72,6 @@
 #include <babeltrace2/trace-ir/field-path-const.h>
 #include <babeltrace2/trace-ir/field.h>
 #include <babeltrace2/trace-ir/packet-const.h>
-#include <babeltrace2/trace-ir/packet-context-field.h>
 #include <babeltrace2/trace-ir/packet.h>
 #include <babeltrace2/trace-ir/stream-class-const.h>
 #include <babeltrace2/trace-ir/stream-class.h>
@@ -93,6 +94,7 @@
 #include <babeltrace2/graph/self-component-class-filter.h>
 #include <babeltrace2/graph/self-component-class-sink.h>
 #include <babeltrace2/graph/self-component-class-source.h>
+#include <babeltrace2/graph/self-component-class.h>
 
 /* Component API */
 #include <babeltrace2/graph/component-const.h>
@@ -109,7 +111,6 @@
 
 /* Message iterator API */
 #include <babeltrace2/graph/message-iterator.h>
-#include <babeltrace2/graph/port-output-message-iterator.h>
 #include <babeltrace2/graph/self-component-port-input-message-iterator.h>
 #include <babeltrace2/graph/self-message-iterator.h>
 
@@ -134,14 +135,20 @@
 #include <babeltrace2/graph/message-stream-end.h>
 
 /* Graph API */
+#include <babeltrace2/graph/component-descriptor-set-const.h>
+#include <babeltrace2/graph/component-descriptor-set.h>
 #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/mip.h>
 #include <babeltrace2/graph/port-const.h>
 #include <babeltrace2/graph/port-input-const.h>
 #include <babeltrace2/graph/port-output-const.h>
 
 /* Query executor API */
+#include <babeltrace2/graph/private-query-executor.h>
 #include <babeltrace2/graph/query-executor-const.h>
 #include <babeltrace2/graph/query-executor.h>
 
@@ -153,20 +160,25 @@
 #include <babeltrace2/plugin/plugin-dev.h>
 
 /* 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 */