X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Flib%2Fconds%2Futils.hpp;fp=tests%2Flib%2Fconds%2Futils.hpp;h=aa44bba4059f97210e4ee16ba6056ea1b6f66e3c;hp=d742d9088f317d9a42405752cc17a2244e185462;hb=25fe6ea5b2626380612aeb0db1a9fa71d3c53952;hpb=4ad4365795e89089c88b28c483bb19fe77091632

diff --git a/tests/lib/conds/utils.hpp b/tests/lib/conds/utils.hpp
index d742d908..aa44bba4 100644
--- a/tests/lib/conds/utils.hpp
+++ b/tests/lib/conds/utils.hpp
@@ -8,13 +8,14 @@
 #define TESTS_LIB_CONDS_UTILS_HPP
 
 #include <functional>
+#include <memory>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include <babeltrace2/babeltrace.h>
 
 #include "cpp-common/bt2c/c-string-view.hpp"
-#include "cpp-common/bt2s/span.hpp"
 
 #include "../utils/run-in.hpp"
 
@@ -28,6 +29,8 @@
 class CondTrigger
 {
 public:
+    using UP = std::unique_ptr<CondTrigger>;
+
     /*
      * Condition type.
      */
@@ -135,7 +138,7 @@ private:
 /*
  * List of condition triggers.
  */
-using CondTriggers = bt2s::span<CondTrigger * const>;
+using CondTriggers = std::vector<CondTrigger::UP>;
 
 /*
  * The entry point of a condition trigger program.
@@ -174,6 +177,6 @@ using CondTriggers = bt2s::span<CondTrigger * const>;
  *     The program is expected to abort through a libbabeltrace2
  *     condition failure.
  */
-void condMain(int argc, const char **argv, CondTriggers triggers) noexcept;
+void condMain(int argc, const char **argv, const CondTriggers& triggers) noexcept;
 
 #endif /* TESTS_LIB_CONDS_UTILS_HPP */