Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix a few variable shadowing warnings in public headers. #1233

Merged
merged 5 commits into from
Feb 6, 2024
Merged

Fix a few variable shadowing warnings in public headers. #1233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
77c2c5f
Fix a few variable shadowing warnings in public headers.
mkoscumb Jan 24, 2024
96889c2
Merge branch 'main' into user/makoscum/FixVariableShadowingWarnings
mkoscumb Feb 2, 2024
d7ab740
Merge branch 'main' into user/makoscum/FixVariableShadowingWarnings
mkoscumb Feb 2, 2024
3d7f705
Merge branch 'main' into user/makoscum/FixVariableShadowingWarnings
mkoscumb Feb 5, 2024
4613b1f
Merge branch 'main' into user/makoscum/FixVariableShadowingWarnings
mkoscumb Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/include/public/CAPIClient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions lib/include/public/DebugEvents.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,10 @@ namespace MAT_NS_BEGIN
/// <summary>DebugEvent The default DebugEvent constructor.</summary>
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_) {};
};

/// <summary>
Expand Down
12 changes: 6 additions & 6 deletions lib/include/public/TransmitProfiles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,28 +84,28 @@ namespace MAT_NS_BEGIN
/// TransmitProfileRule constructor taking a collection of timers.
/// </summary>
/// <param name="timers">A vector of integers that contain per-priority transmission timers.</param>
TransmitProfileRule(std::vector<int>&& timers)
: timers(std::move(timers)) { }
TransmitProfileRule(std::vector<int>&& timers_)
: timers(std::move(timers_)) { }

/// <summary>
/// TransmitProfileRule constructor taking a NetworkCost and a collection of timers.
/// </summary>
/// <param name="networkCost">The network cost, as one of the MAT::NetworkCost enumeration values.</param>
/// <param name="timers">A vector of integers that contain per-priority transmission timers.</param>
TransmitProfileRule(NetworkCost networkCost, std::vector<int>&& timers)
TransmitProfileRule(NetworkCost networkCost, std::vector<int>&& timers_)
: netCost(networkCost)
, timers(std::move(timers)) { }
, timers(std::move(timers_)) { }

/// <summary>
/// TransmitProfileRule constructor taking a NetworkCost, PowerSource, and a collection of timers.
/// </summary>
/// <param name="networkCost">The network cost, as one of the MAT::NetworkCost enumeration values.</param>
/// <param name="powerSource">The power state, as one of the MAT::PowerSource enumeration values.</param>
/// <param name="timers">A vector of integers that contain per-priority transmission timers.</param>
TransmitProfileRule(NetworkCost networkCost, PowerSource powerSource, std::vector<int>&& timers)
TransmitProfileRule(NetworkCost networkCost, PowerSource powerSource, std::vector<int>&& timers_)
: netCost(networkCost)
, powerState(powerSource)
, timers(std::move(timers)) { }
, timers(std::move(timers_)) { }

} TransmitProfileRule;

Expand Down
Loading