src/cpp-common/bt2c: rename `span.hpp` -> `make-span.hpp`

bt2c::makeSpan() is the only thing `make-span.hpp` offers.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I3a4a9cb0712cc97d11e9c9adf26f77539f5bb76c
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12454
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 05feb3e741b026bfec2a82591f0dabee1bf8894e..d2cec2314fa11bfa8bd730ea4507de6c50605649 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -171,10 +171,10 @@ cpp_common_libcpp_common_la_SOURCES = \
        cpp-common/bt2c/glib-up.hpp \
        cpp-common/bt2c/libc-up.hpp \
        cpp-common/bt2c/logging.hpp \
+       cpp-common/bt2c/make-span.hpp \
        cpp-common/bt2c/prio-heap.hpp \
        cpp-common/bt2c/read-fixed-len-int.hpp \
        cpp-common/bt2c/safe-ops.hpp \
-       cpp-common/bt2c/span.hpp \
        cpp-common/bt2c/std-int.hpp \
        cpp-common/bt2c/type-traits.hpp \
        cpp-common/bt2c/uuid.hpp \

diff --git a/src/cpp-common/bt2c/make-span.hpp b/src/cpp-common/bt2c/make-span.hpp
new file mode 100644 (file)
index 0000000..2270a8f
--- /dev/null
+++ b/src/cpp-common/bt2c/make-span.hpp
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2024 EfficiOS Inc.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef BABELTRACE_CPP_COMMON_BT2C_MAKE_SPAN_HPP
+#define BABELTRACE_CPP_COMMON_BT2C_MAKE_SPAN_HPP
+
+#include "cpp-common/bt2s/span.hpp"
+
+namespace bt2c {
+
+template <class T>
+inline constexpr bt2s::span<T> makeSpan(T * const ptr, const size_t count) noexcept
+{
+    return nonstd::make_span(ptr, count);
+}
+
+} /* namespace bt2c */
+
+#endif /* BABELTRACE_CPP_COMMON_BT2C_MAKE_SPAN_HPP */

diff --git a/src/cpp-common/bt2c/span.hpp b/src/cpp-common/bt2c/span.hpp
deleted file mode 100644 (file)
index 05ab3d7..0000000
--- a/src/cpp-common/bt2c/span.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2024 EfficiOS Inc.
- *
- * SPDX-License-Identifier: MIT
- */
-
-#ifndef BABELTRACE_CPP_COMMON_BT2C_SPAN_HPP
-#define BABELTRACE_CPP_COMMON_BT2C_SPAN_HPP
-
-#include "cpp-common/bt2s/span.hpp"
-
-namespace bt2c {
-
-template <class T>
-inline constexpr bt2s::span<T> makeSpan(T * const ptr, const size_t count) noexcept
-{
-    return nonstd::make_span(ptr, count);
-}
-
-} /* namespace bt2c */
-
-#endif /* BABELTRACE_CPP_COMMON_BT2C_SPAN_HPP */

diff --git a/tests/lib/conds/conds-triggers.cpp b/tests/lib/conds/conds-triggers.cpp
index 1c174c0158cc672c26d91282b5986c39c0008657..02fe33cee929a8797a7659aaee497307ad0492cf 100644 (file)
--- a/tests/lib/conds/conds-triggers.cpp
+++ b/tests/lib/conds/conds-triggers.cpp
@@ -10,7 +10,7 @@
 
 #include "cpp-common/bt2/graph.hpp"
 #include "cpp-common/bt2c/c-string-view.hpp"
-#include "cpp-common/bt2c/span.hpp"
+#include "cpp-common/bt2c/make-span.hpp"
 #include "cpp-common/bt2s/make-unique.hpp"
 
 #include "clk-cls-compat-postconds-triggers.hpp"