F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wifi: Fix some more Visual Studio warnings in SupportedRates

Browse Source
This commit is contained in:
Robert Ammon
2018-05-23 06:18:58 +02:00
parent e4507b7633
commit b15b16f753
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wifi/model/supported-rates.cc
View File

@@ -71,7 +71,7 @@ SupportedRates::AddSupportedRate (uint64_t bs)
}
void
SupportedRates::SetBasicRate (uint32_t bs)
SupportedRates::SetBasicRate (uint64_t bs)
{
NS_LOG_FUNCTION (this << bs);
NS_ASSERT_MSG (IsBssMembershipSelectorRate (bs) == false, "Invalid rate");
@@ -94,7 +94,7 @@ SupportedRates::SetBasicRate (uint32_t bs)
}
void
SupportedRates::AddBssMembershipSelectorRate (uint32_t bs)
SupportedRates::AddBssMembershipSelectorRate (uint64_t bs)
{
NS_LOG_FUNCTION (this << bs);
if ((bs != BSS_MEMBERSHIP_SELECTOR_HT_PHY) && (bs != BSS_MEMBERSHIP_SELECTOR_VHT_PHY) && (bs != BSS_MEMBERSHIP_SELECTOR_HE_PHY))
@@ -146,7 +146,7 @@ SupportedRates::IsSupportedRate (uint64_t bs) const
}
bool
SupportedRates::IsBssMembershipSelectorRate (uint32_t bs) const
SupportedRates::IsBssMembershipSelectorRate (uint64_t bs) const
{
NS_LOG_FUNCTION (this << bs);
if ((bs & 0x7f) == BSS_MEMBERSHIP_SELECTOR_HT_PHY

6
src/wifi/model/supported-rates.h
View File

@@ -159,14 +159,14 @@ public:
*
* \param bs the rate to be set
*/
void SetBasicRate (uint32_t bs);
void SetBasicRate (uint64_t bs);
/**
* Add a special value to the supported rate set, corresponding to
* a BSS membership selector
*
* \param bs the special membership selector value (not a valid rate)
*/
void AddBssMembershipSelectorRate (uint32_t bs);
void AddBssMembershipSelectorRate (uint64_t bs);
/**
* Check if the given rate is supported. The rate is encoded as it is
* serialized to the Supported Rates Information Element (i.e. as a
@@ -196,7 +196,7 @@ public:
*
* \return true if the rate is a BSS membership selector, false otherwise
*/
bool IsBssMembershipSelectorRate (uint32_t bs) const;
bool IsBssMembershipSelectorRate (uint64_t bs) const;
/**
* Return the number of supported rates.
*