Skip to content

Commit e6dcf9a

Browse files
authored
Fix a few variable shadowing warnings in public headers. (#1233)
1 parent 18d0ea2 commit e6dcf9a

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

lib/include/public/CAPIClient.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ namespace MAT_NS_BEGIN
2929

3030
public:
3131

32-
CAPIClient(evt_handle_t lib = 0) :
32+
CAPIClient(evt_handle_t lib_ = 0) :
3333
handle(0),
34-
lib(lib)
34+
lib(lib_)
3535
{
3636
if (lib != 0)
3737
evt_load(lib);

lib/include/public/DebugEvents.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ namespace MAT_NS_BEGIN
156156
/// <summary>DebugEvent The default DebugEvent constructor.</summary>
157157
DebugEvent() : seq(0), ts(0), type(EVT_UNKNOWN), param1(0), param2(0), data(NULL), size(0) {};
158158

159-
DebugEvent(DebugEventType type) : seq(0), ts(0), type(type), param1(0), param2(0), data(NULL), size(0) {};
159+
DebugEvent(DebugEventType type_) : seq(0), ts(0), type(type_), param1(0), param2(0), data(NULL), size(0) {};
160160

161-
DebugEvent(DebugEventType type, size_t param1, size_t param2 = 0, void* data = nullptr, size_t size = 0) :
162-
seq(0), ts(0), type(type), param1(param1), param2(param2), data(data), size(size) {};
161+
DebugEvent(DebugEventType type_, size_t param1_, size_t param2_ = 0, void* data_ = nullptr, size_t size_ = 0) :
162+
seq(0), ts(0), type(type_), param1(param1_), param2(param2_), data(data_), size(size_) {};
163163
};
164164

165165
/// <summary>

lib/include/public/TransmitProfiles.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -84,28 +84,28 @@ namespace MAT_NS_BEGIN
8484
/// TransmitProfileRule constructor taking a collection of timers.
8585
/// </summary>
8686
/// <param name="timers">A vector of integers that contain per-priority transmission timers.</param>
87-
TransmitProfileRule(std::vector<int>&& timers)
88-
: timers(std::move(timers)) { }
87+
TransmitProfileRule(std::vector<int>&& timers_)
88+
: timers(std::move(timers_)) { }
8989

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

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

110110
} TransmitProfileRule;
111111

0 commit comments

Comments
 (0)