From 77c2c5feb4e9a6cd0798f23fa01286ee73bb5853 Mon Sep 17 00:00:00 2001 From: Matt Koscumb Date: Wed, 24 Jan 2024 09:25:16 -0800 Subject: [PATCH] Fix a few variable shadowing warnings in public headers. --- lib/include/public/CAPIClient.hpp | 4 ++-- lib/include/public/DebugEvents.hpp | 6 +++--- lib/include/public/TransmitProfiles.hpp | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/include/public/CAPIClient.hpp b/lib/include/public/CAPIClient.hpp index 6ec397a08..a632f2b02 100644 --- a/lib/include/public/CAPIClient.hpp +++ b/lib/include/public/CAPIClient.hpp @@ -29,9 +29,9 @@ namespace MAT_NS_BEGIN public: - CAPIClient(evt_handle_t lib = 0) : + CAPIClient(evt_handle_t lib_ = 0) : handle(0), - lib(lib) + lib(lib_) { if (lib != 0) evt_load(lib); diff --git a/lib/include/public/DebugEvents.hpp b/lib/include/public/DebugEvents.hpp index 860de0e6b..d4f9c83a0 100644 --- a/lib/include/public/DebugEvents.hpp +++ b/lib/include/public/DebugEvents.hpp @@ -156,10 +156,10 @@ namespace MAT_NS_BEGIN /// DebugEvent The default DebugEvent constructor. DebugEvent() : seq(0), ts(0), type(EVT_UNKNOWN), param1(0), param2(0), data(NULL), size(0) {}; - DebugEvent(DebugEventType type) : seq(0), ts(0), type(type), param1(0), param2(0), data(NULL), size(0) {}; + DebugEvent(DebugEventType type_) : seq(0), ts(0), type(type_), param1(0), param2(0), data(NULL), size(0) {}; - DebugEvent(DebugEventType type, size_t param1, size_t param2 = 0, void* data = nullptr, size_t size = 0) : - seq(0), ts(0), type(type), param1(param1), param2(param2), data(data), size(size) {}; + DebugEvent(DebugEventType type_, size_t param1_, size_t param2_ = 0, void* data_ = nullptr, size_t size_ = 0) : + seq(0), ts(0), type(type_), param1(param1_), param2(param2_), data(data_), size(size_) {}; }; /// diff --git a/lib/include/public/TransmitProfiles.hpp b/lib/include/public/TransmitProfiles.hpp index 7af3b6c69..37e8e4355 100644 --- a/lib/include/public/TransmitProfiles.hpp +++ b/lib/include/public/TransmitProfiles.hpp @@ -84,17 +84,17 @@ namespace MAT_NS_BEGIN /// TransmitProfileRule constructor taking a collection of timers. /// /// A vector of integers that contain per-priority transmission timers. - TransmitProfileRule(std::vector&& timers) - : timers(std::move(timers)) { } + TransmitProfileRule(std::vector&& timers_) + : timers(std::move(timers_)) { } /// /// TransmitProfileRule constructor taking a NetworkCost and a collection of timers. /// /// The network cost, as one of the MAT::NetworkCost enumeration values. /// A vector of integers that contain per-priority transmission timers. - TransmitProfileRule(NetworkCost networkCost, std::vector&& timers) + TransmitProfileRule(NetworkCost networkCost, std::vector&& timers_) : netCost(networkCost) - , timers(std::move(timers)) { } + , timers(std::move(timers_)) { } /// /// TransmitProfileRule constructor taking a NetworkCost, PowerSource, and a collection of timers. @@ -102,10 +102,10 @@ namespace MAT_NS_BEGIN /// The network cost, as one of the MAT::NetworkCost enumeration values. /// The power state, as one of the MAT::PowerSource enumeration values. /// A vector of integers that contain per-priority transmission timers. - TransmitProfileRule(NetworkCost networkCost, PowerSource powerSource, std::vector&& timers) + TransmitProfileRule(NetworkCost networkCost, PowerSource powerSource, std::vector&& timers_) : netCost(networkCost) , powerState(powerSource) - , timers(std::move(timers)) { } + , timers(std::move(timers_)) { } } TransmitProfileRule;