tests/lib: C++ify `conds/utils.cpp` a bit

[babeltrace.git] / tests / lib / conds / utils.hpp

diff --git a/tests/lib/conds/utils.hpp b/tests/lib/conds/utils.hpp
index 8d01efec39bbcf5462f868953eb50aa7c95b023e..53676d8c01e09828b9c57e3b019ef4deffa339f0 100644 (file)
--- a/tests/lib/conds/utils.hpp
+++ b/tests/lib/conds/utils.hpp
@@ -9,6 +9,9 @@
 
 #include <babeltrace2/babeltrace.h>
 
+#include "cpp-common/bt2/self-component-port.hpp"
+#include "cpp-common/bt2s/span.hpp"
+
 enum cond_trigger_func_type
 {
     COND_TRIGGER_FUNC_TYPE_BASIC,
@@ -22,7 +25,7 @@ enum cond_trigger_type
 };
 
 typedef void (*cond_trigger_basic_func)(void);
-typedef void (*cond_trigger_run_in_comp_cls_init_func)(bt_self_component *);
+typedef void (*cond_trigger_run_in_comp_cls_init_func)(bt2::SelfComponent);
 
 struct cond_trigger
 {
@@ -69,7 +72,6 @@ struct cond_trigger
         }                                                                                          \
     }
 
-void cond_main(int argc, const char *argv[], const struct cond_trigger triggers[],
-               size_t trigger_count);
+void condMain(int argc, const char **argv, bt2s::span<const cond_trigger> triggers) noexcept;
 
 #endif /* TESTS_LIB_CONDS_UTILS_H */