Fix a few variable shadowing warnings in public headers. (#1233)
This commit is contained in:
Родитель
18d0ea28fa
Коммит
e6dcf9a03e
|
@ -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);
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -84,17 +84,17 @@ 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.
|
||||
|
@ -102,10 +102,10 @@ namespace MAT_NS_BEGIN
|
|||
/// <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;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче