From c40b7b8a76c864db9c74b2ecf6833f52fc7646e0 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 19 Feb 2024 13:20:44 -0500 Subject: [PATCH] cpp-common/bt2: move findAllPluginsFromDir() to `plugin-load.hpp` All "find plugin(s)" function will go in that file. Change-Id: Ie81a35d8a253dafef2fd696c64341609b0e4960b Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/11821 Tested-by: jenkins Reviewed-by: Philippe Proulx --- src/Makefile.am | 2 +- src/cpp-common/bt2/{plugin.hpp => plugin-load.hpp} | 6 +++--- tests/lib/test-plugin-init-fail.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/cpp-common/bt2/{plugin.hpp => plugin-load.hpp} (86%) diff --git a/src/Makefile.am b/src/Makefile.am index 873ccf85..235dab4e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -135,8 +135,8 @@ cpp_common_libcpp_common_la_SOURCES = \ cpp-common/bt2/message.hpp \ cpp-common/bt2/optional-borrowed-object.hpp \ cpp-common/bt2/plugin-dev.hpp \ + cpp-common/bt2/plugin-load.hpp \ cpp-common/bt2/plugin-set.hpp \ - cpp-common/bt2/plugin.hpp \ cpp-common/bt2/private-query-executor.hpp \ cpp-common/bt2/query-executor.hpp \ cpp-common/bt2/raw-value-proxy.hpp \ diff --git a/src/cpp-common/bt2/plugin.hpp b/src/cpp-common/bt2/plugin-load.hpp similarity index 86% rename from src/cpp-common/bt2/plugin.hpp rename to src/cpp-common/bt2/plugin-load.hpp index 6d1a71a6..0f3e8d5e 100644 --- a/src/cpp-common/bt2/plugin.hpp +++ b/src/cpp-common/bt2/plugin-load.hpp @@ -4,8 +4,8 @@ * SPDX-License-Identifier: MIT */ -#ifndef BABELTRACE_CPP_COMMON_BT2_PLUGIN_HPP -#define BABELTRACE_CPP_COMMON_BT2_PLUGIN_HPP +#ifndef BABELTRACE_CPP_COMMON_BT2_PLUGIN_LOAD_HPP +#define BABELTRACE_CPP_COMMON_BT2_PLUGIN_LOAD_HPP #include @@ -38,4 +38,4 @@ inline ConstPluginSet::Shared findAllPluginsFromDir(const bt2c::CStringView path } /* namespace bt2 */ -#endif /* BABELTRACE_CPP_COMMON_BT2_PLUGIN_HPP */ +#endif /* BABELTRACE_CPP_COMMON_BT2_PLUGIN_LOAD_HPP */ diff --git a/tests/lib/test-plugin-init-fail.cpp b/tests/lib/test-plugin-init-fail.cpp index 8a0fde62..6aac20d0 100644 --- a/tests/lib/test-plugin-init-fail.cpp +++ b/tests/lib/test-plugin-init-fail.cpp @@ -8,7 +8,7 @@ #include "common/common.h" #include "cpp-common/bt2/exc.hpp" -#include "cpp-common/bt2/plugin.hpp" +#include "cpp-common/bt2/plugin-load.hpp" #include "cpp-common/bt2c/c-string-view.hpp" #include "cpp-common/vendor/fmt/core.h" -- 2.34.1