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

wifi: Eliminate some Visual Studio compiler warnings (based on Robert Ammon's patch)

Browse Source
This commit is contained in:
Sébastien Deronne
2018-02-27 20:29:17 +01:00
parent a1a1a5990f
commit 6ffe1f247f
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/wifi/examples/test-interference-helper.cc
View File

@@ -248,7 +248,7 @@ int main (int argc, char *argv[])
InterferenceExperiment::Input input;
std::string str_standard = "WIFI_PHY_STANDARD_80211a";
std::string str_preamble = "WIFI_PREAMBLE_LONG";
double delay = 0; //microseconds
uint64_t delay = 0; //microseconds
CommandLine cmd;
cmd.AddValue ("delay", "Delay in microseconds between frame transmission from sender A and frame transmission from sender B", delay);
@@ -269,11 +269,6 @@ int main (int argc, char *argv[])
cmd.AddValue ("expectRxBSuccessfull", "Indicate whether packet B is expected to be successfully received", expectRxBSuccessfull);
cmd.Parse (argc, argv);
LogComponentEnable ("WifiPhy", LOG_LEVEL_ALL);
LogComponentEnable ("YansWifiPhy", LOG_LEVEL_ALL);
LogComponentEnable ("InterferenceHelper", LOG_LEVEL_ALL);
LogComponentEnable ("SimpleFrameCaptureModel", LOG_LEVEL_ALL);
input.interval = MicroSeconds (delay);
if (input.xA >= 0 || input.xB <= 0)

6
src/wifi/examples/wifi-manager-example.cc
View File

@@ -103,7 +103,7 @@ struct StandardInfo
* \param xMax x maximum
* \param yMax y maximum
*/
StandardInfo (std::string name, WifiPhyStandard standard, uint16_t width, double snrLow, double snrHigh, double xMin, double xMax, double yMax)
StandardInfo (std::string name, WifiPhyStandard standard, uint8_t width, double snrLow, double snrHigh, double xMin, double xMax, double yMax)
: m_name (name),
m_standard (standard),
m_width (width),
@@ -116,7 +116,7 @@ struct StandardInfo
}
std::string m_name; ///< name
WifiPhyStandard m_standard; ///< standard
uint16_t m_width; ///< channel width
uint8_t m_width; ///< channel width
double m_snrLow; ///< lowest SNR
double m_snrHigh; ///< highest SNR
double m_xMin; ///< X minimum
@@ -317,7 +317,7 @@ int main (int argc, char *argv[])
NS_ABORT_IF (clientSelectedStandard.m_name == "none");
std::cout << "Testing " << serverSelectedStandard.m_name << " with " << wifiManager << " ..." << std::endl;
NS_ABORT_MSG_IF (clientSelectedStandard.m_snrLow >= clientSelectedStandard.m_snrHigh, "SNR values in wrong order");
steps = std::abs ((int) (clientSelectedStandard.m_snrHigh - clientSelectedStandard.m_snrLow ) / stepSize) + 1;
steps = static_cast<uint32_t>(std::abs<double> ((clientSelectedStandard.m_snrHigh - clientSelectedStandard.m_snrLow ) / stepSize) + 1);
NS_LOG_DEBUG ("Using " << steps << " steps for SNR range " << clientSelectedStandard.m_snrLow << ":" << clientSelectedStandard.m_snrHigh);
Ptr<Node> clientNode = CreateObject<Node> ();
Ptr<Node> serverNode = CreateObject<Node> ();

4
src/wifi/helper/wifi-helper.cc
View File

@@ -205,7 +205,7 @@ WifiPhyHelper::PcapSniffTxEvent (
if (txVector.GetMode ().GetModulationClass () != WIFI_MOD_CLASS_HT && txVector.GetMode ().GetModulationClass () != WIFI_MOD_CLASS_VHT && txVector.GetMode ().GetModulationClass () != WIFI_MOD_CLASS_HE)
{
rate = txVector.GetMode ().GetDataRate (txVector.GetChannelWidth (), txVector.GetGuardInterval (), 1) * txVector.GetNss () / 500000;
header.SetRate (rate);
header.SetRate (static_cast<uint8_t>(rate));
}
uint16_t channelFlags = 0;
@@ -399,7 +399,7 @@ WifiPhyHelper::PcapSniffRxEvent (
if (txVector.GetMode ().GetModulationClass () != WIFI_MOD_CLASS_HT && txVector.GetMode ().GetModulationClass () != WIFI_MOD_CLASS_VHT && txVector.GetMode ().GetModulationClass () != WIFI_MOD_CLASS_HE)
{
rate = txVector.GetMode ().GetDataRate (txVector.GetChannelWidth (), txVector.GetGuardInterval (), 1) * txVector.GetNss () / 500000;
header.SetRate (rate);
header.SetRate (static_cast<uint8_t>(rate));
}
uint16_t channelFlags = 0;