tests/lib: pass C++ wrapper types to `RunIn` callbacks

[babeltrace.git] / tests / lib / utils / run-in.hpp

diff --git a/tests/lib/utils/run-in.hpp b/tests/lib/utils/run-in.hpp
index 0855e05e062ba697b3f9b4b4b51ad3a11833e634..01774f9053f5e424dcea154d84b31d73f3f955c2 100644 (file)
--- a/tests/lib/utils/run-in.hpp
+++ b/tests/lib/utils/run-in.hpp
@@ -11,9 +11,13 @@
 
 #include <babeltrace2/babeltrace.h>
 
-using RunInCompClsQueryFunc = std::function<void(bt_self_component_class *)>;
-using RunInCompClsInitFunc = std::function<void(bt_self_component *)>;
-using RunInMsgIterClsInitFunc = std::function<void(bt_self_message_iterator *)>;
+#include "cpp-common/bt2/self-component-class.hpp"
+#include "cpp-common/bt2/self-component-port.hpp"
+#include "cpp-common/bt2/self-message-iterator.hpp"
+
+using RunInCompClsQueryFunc = std::function<void(bt2::SelfComponentClass)>;
+using RunInCompClsInitFunc = std::function<void(bt2::SelfComponent)>;
+using RunInMsgIterClsInitFunc = std::function<void(bt2::SelfMessageIterator)>;
 
 /*
  * Runs: