From 8aee46a3d5fa54b6fdacf8684fb9bb819901677d Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 27 Oct 2023 14:52:32 -0400 Subject: [PATCH] cpp-common/bt2: rename `common-iter.hpp` to `common-iterator.hpp` Signed-off-by: Philippe Proulx Change-Id: I4816ab3ecf2b19423f8ab0a92924e62c438df4f9 Reviewed-on: https://review.lttng.org/c/babeltrace/+/11164 Reviewed-by: Simon Marchi --- src/Makefile.am | 2 +- src/cpp-common/bt2/{common-iter.hpp => common-iterator.hpp} | 6 +++--- src/cpp-common/bt2/field-class.hpp | 2 +- src/cpp-common/bt2/field-path.hpp | 2 +- src/cpp-common/bt2/integer-range-set.hpp | 2 +- src/cpp-common/bt2/value.hpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename src/cpp-common/bt2/{common-iter.hpp => common-iterator.hpp} (91%) diff --git a/src/Makefile.am b/src/Makefile.am index 1f90d14b..5e2ac10a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,7 @@ noinst_HEADERS = \ cpp-common/bt2/borrowed-object.hpp \ cpp-common/bt2/clock-class.hpp \ cpp-common/bt2/clock-snapshot.hpp \ - cpp-common/bt2/common-iter.hpp \ + cpp-common/bt2/common-iterator.hpp \ cpp-common/bt2/exc.hpp \ cpp-common/bt2/field-class.hpp \ cpp-common/bt2/field.hpp \ diff --git a/src/cpp-common/bt2/common-iter.hpp b/src/cpp-common/bt2/common-iterator.hpp similarity index 91% rename from src/cpp-common/bt2/common-iter.hpp rename to src/cpp-common/bt2/common-iterator.hpp index 84888844..e878b1b9 100644 --- a/src/cpp-common/bt2/common-iter.hpp +++ b/src/cpp-common/bt2/common-iterator.hpp @@ -4,8 +4,8 @@ * SPDX-License-Identifier: MIT */ -#ifndef BABELTRACE_CPP_COMMON_BT2_COMMON_ITER_HPP -#define BABELTRACE_CPP_COMMON_BT2_COMMON_ITER_HPP +#ifndef BABELTRACE_CPP_COMMON_BT2_COMMON_ITERATOR_HPP +#define BABELTRACE_CPP_COMMON_BT2_COMMON_ITERATOR_HPP #include #include @@ -91,4 +91,4 @@ private: } /* namespace bt2 */ -#endif /* BABELTRACE_CPP_COMMON_BT2_COMMON_ITER_HPP */ +#endif /* BABELTRACE_CPP_COMMON_BT2_COMMON_ITERATOR_HPP */ diff --git a/src/cpp-common/bt2/field-class.hpp b/src/cpp-common/bt2/field-class.hpp index 168af69c..0999b135 100644 --- a/src/cpp-common/bt2/field-class.hpp +++ b/src/cpp-common/bt2/field-class.hpp @@ -17,7 +17,7 @@ #include "cpp-common/string_view.hpp" #include "borrowed-object.hpp" -#include "common-iter.hpp" +#include "common-iterator.hpp" #include "exc.hpp" #include "field-path.hpp" #include "integer-range-set.hpp" diff --git a/src/cpp-common/bt2/field-path.hpp b/src/cpp-common/bt2/field-path.hpp index 97c1addd..ef5ff090 100644 --- a/src/cpp-common/bt2/field-path.hpp +++ b/src/cpp-common/bt2/field-path.hpp @@ -14,7 +14,7 @@ #include "common/assert.h" #include "borrowed-object.hpp" -#include "common-iter.hpp" +#include "common-iterator.hpp" #include "shared-object.hpp" namespace bt2 { diff --git a/src/cpp-common/bt2/integer-range-set.hpp b/src/cpp-common/bt2/integer-range-set.hpp index b090a330..d58b93cb 100644 --- a/src/cpp-common/bt2/integer-range-set.hpp +++ b/src/cpp-common/bt2/integer-range-set.hpp @@ -13,7 +13,7 @@ #include #include "borrowed-object.hpp" -#include "common-iter.hpp" +#include "common-iterator.hpp" #include "exc.hpp" #include "integer-range.hpp" #include "internal/utils.hpp" diff --git a/src/cpp-common/bt2/value.hpp b/src/cpp-common/bt2/value.hpp index 7596694c..1aa41318 100644 --- a/src/cpp-common/bt2/value.hpp +++ b/src/cpp-common/bt2/value.hpp @@ -19,7 +19,7 @@ #include "cpp-common/string_view.hpp" #include "borrowed-object.hpp" -#include "common-iter.hpp" +#include "common-iterator.hpp" #include "exc.hpp" #include "internal/utils.hpp" #include "shared-object.hpp" -- 2.34.1