From c458c6307854b468d2c1d4be5add316a61aa3656 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 23 Apr 2024 12:49:05 -0400 Subject: [PATCH] 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 Change-Id: I3a4a9cb0712cc97d11e9c9adf26f77539f5bb76c Reviewed-on: https://review.lttng.org/c/babeltrace/+/12454 Tested-by: jenkins Reviewed-by: Simon Marchi --- src/Makefile.am | 2 +- src/cpp-common/bt2c/{span.hpp => make-span.hpp} | 6 +++--- tests/lib/conds/conds-triggers.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/cpp-common/bt2c/{span.hpp => make-span.hpp} (67%) diff --git a/src/Makefile.am b/src/Makefile.am index 05feb3e7..d2cec231 100644 --- 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/span.hpp b/src/cpp-common/bt2c/make-span.hpp similarity index 67% rename from src/cpp-common/bt2c/span.hpp rename to src/cpp-common/bt2c/make-span.hpp index 05ab3d79..2270a8fb 100644 --- a/src/cpp-common/bt2c/span.hpp +++ b/src/cpp-common/bt2c/make-span.hpp @@ -4,8 +4,8 @@ * SPDX-License-Identifier: MIT */ -#ifndef BABELTRACE_CPP_COMMON_BT2C_SPAN_HPP -#define BABELTRACE_CPP_COMMON_BT2C_SPAN_HPP +#ifndef BABELTRACE_CPP_COMMON_BT2C_MAKE_SPAN_HPP +#define BABELTRACE_CPP_COMMON_BT2C_MAKE_SPAN_HPP #include "cpp-common/bt2s/span.hpp" @@ -19,4 +19,4 @@ inline constexpr bt2s::span makeSpan(T * const ptr, const size_t count) noexc } /* namespace bt2c */ -#endif /* BABELTRACE_CPP_COMMON_BT2C_SPAN_HPP */ +#endif /* BABELTRACE_CPP_COMMON_BT2C_MAKE_SPAN_HPP */ diff --git a/tests/lib/conds/conds-triggers.cpp b/tests/lib/conds/conds-triggers.cpp index 1c174c01..02fe33ce 100644 --- 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" -- 2.34.1