From 4d1864bfda8c728deea81b1d97a4bedb26cf7637 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Sat, 21 Oct 2023 22:21:19 +0000 Subject: [PATCH] Fixes pointed out by the clang analyzer. 1. Remove the default Logger copy constructor without copy assignment (rule of three -> rule of zero). 2. Remove an unnecessary capture in a lambda. 3. Mark a variable unused. 4. Mark a method as override. Signed-off-by: Chris Lalancette --- rclcpp/include/rclcpp/logger.hpp | 3 --- rclcpp/src/rclcpp/context.cpp | 2 +- rclcpp/test/rclcpp/executors/test_executors.cpp | 1 + rclcpp/test/rclcpp/test_intra_process_manager.cpp | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/rclcpp/include/rclcpp/logger.hpp b/rclcpp/include/rclcpp/logger.hpp index 77f7f8d670..3b8e8a1625 100644 --- a/rclcpp/include/rclcpp/logger.hpp +++ b/rclcpp/include/rclcpp/logger.hpp @@ -126,9 +126,6 @@ class Logger std::shared_ptr> logger_sublogger_pairname_ = nullptr; public: - RCLCPP_PUBLIC - Logger(const Logger &) = default; - /// Get the name of this logger. /** * \return the full name of the logger including any prefixes, or diff --git a/rclcpp/src/rclcpp/context.cpp b/rclcpp/src/rclcpp/context.cpp index 35a11730ab..75c451a861 100644 --- a/rclcpp/src/rclcpp/context.cpp +++ b/rclcpp/src/rclcpp/context.cpp @@ -462,7 +462,7 @@ template std::vector Context::get_shutdown_callback() const { - const auto get_callback_vector = [this](auto & mutex, auto & callback_set) { + const auto get_callback_vector = [](auto & mutex, auto & callback_set) { const std::lock_guard lock(mutex); std::vector callbacks; for (auto & callback : callback_set) { diff --git a/rclcpp/test/rclcpp/executors/test_executors.cpp b/rclcpp/test/rclcpp/executors/test_executors.cpp index fbd410bcab..653f06fb9c 100644 --- a/rclcpp/test/rclcpp/executors/test_executors.cpp +++ b/rclcpp/test/rclcpp/executors/test_executors.cpp @@ -644,6 +644,7 @@ TYPED_TEST(TestExecutors, testRaceConditionAddNode) break; } total += k * (i + 42); + (void)total; } }); } diff --git a/rclcpp/test/rclcpp/test_intra_process_manager.cpp b/rclcpp/test/rclcpp/test_intra_process_manager.cpp index 83cf586e99..da863f3e3c 100644 --- a/rclcpp/test/rclcpp/test_intra_process_manager.cpp +++ b/rclcpp/test/rclcpp/test_intra_process_manager.cpp @@ -289,7 +289,7 @@ class SubscriptionIntraProcessBuffer : public SubscriptionIntraProcessBase } bool - use_take_shared_method() const + use_take_shared_method() const override { return take_shared_method; }