Sort includes in C++ files

[babeltrace.git] / src / plugins / ctf / lttng-live / data-stream.cpp

diff --git a/src/plugins/ctf/lttng-live/data-stream.cpp b/src/plugins/ctf/lttng-live/data-stream.cpp
index 7dd29dfc261dc67cb9c780d3ec231aee4a2ebe89..5ab21297db99b79899ea0389c7fd6a6b2aad3a4b 100644 (file)
--- a/src/plugins/ctf/lttng-live/data-stream.cpp
+++ b/src/plugins/ctf/lttng-live/data-stream.cpp
@@ -7,22 +7,22 @@
  * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
  */
 
-#define BT_COMP_LOG_SELF_COMP self_comp
-#define BT_LOG_OUTPUT_LEVEL   log_level
-#define BT_LOG_TAG            "PLUGIN/SRC.CTF.LTTNG-LIVE/DS"
-#include "logging/comp-logging.h"
-
+#include <glib.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <glib.h>
-
 #include <babeltrace2/babeltrace.h>
 
-#include "../common/msg-iter/msg-iter.hpp"
+#define BT_COMP_LOG_SELF_COMP self_comp
+#define BT_LOG_OUTPUT_LEVEL   log_level
+#define BT_LOG_TAG            "PLUGIN/SRC.CTF.LTTNG-LIVE/DS"
+#include "logging/comp-logging.h"
+
 #include "common/assert.h"
 #include "compat/mman.h"
+
+#include "../common/msg-iter/msg-iter.hpp"
 #include "data-stream.hpp"
 
 #define STREAM_NAME_PREFIX "stream-"
@@ -113,7 +113,6 @@ static struct ctf_msg_iter_medium_ops medops = {
     medop_borrow_stream,
 };
 
-BT_HIDDEN
 enum lttng_live_iterator_status lttng_live_lazy_msg_init(struct lttng_live_session *session,
                                                          bt_self_message_iterator *self_msg_iter)
 {
@@ -167,7 +166,6 @@ error:
     return LTTNG_LIVE_ITERATOR_STATUS_ERROR;
 }
 
-BT_HIDDEN
 struct lttng_live_stream_iterator *
 lttng_live_stream_iterator_create(struct lttng_live_session *session, uint64_t ctf_trace_id,
                                   uint64_t stream_id, bt_self_message_iterator *self_msg_iter)
@@ -251,7 +249,6 @@ end:
     return stream_iter;
 }
 
-BT_HIDDEN
 void lttng_live_stream_iterator_destroy(struct lttng_live_stream_iterator *stream_iter)
 {
     if (!stream_iter) {