Skip to content

Updating master #5

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

Merged
AsavariLimaye merged 16 commits into from
Apr 5, 2017
Merged

Updating master #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7d0a0be
Use standard stdint.h spelling for integer types
Mar 26, 2017
5c2f737
core: s/a exponential/an exponential/
Mar 26, 2017
2a22d76
traffic-control: (fixes #2675) Use correct string value in PIE example
mohittahiliani Mar 27, 2017
3f38701
network: Fix valgrind errors due to ConnectQueueTraces
stavallo Mar 27, 2017
119511e
wifi: Add iterator version of WifiHelper::Install
Mar 27, 2017
8aa4b81
wifi: Rename low and high to first and last to match documentation
Mar 27, 2017
b76b895
Document WifiHelper::Install in CHANGES
Mar 27, 2017
1cff3b7
internet (fixes #2717) Fix Ipv4RoutingTableEntry default route
tomhenderson Mar 31, 2017
aed9cae
mobility: Add GetSize() method to ListPositionAllocator
tomhenderson Mar 31, 2017
87b036b
internet: Add operator== for Ipv4(Multicast)RoutingTableEntry
tomhenderson Mar 31, 2017
b427ecb
internet: remove unused constants from Icmpv6L4protocol
TommyPec Apr 1, 2017
fe92b13
internet: (fixes #2482) Migrating ICMPv6 timers to Attributes
TommyPec Apr 1, 2017
4610d4b
manual: update gnuplot documentation to avoid build-dependent instruc…
TommyPec Apr 2, 2017
b3b8bd1
internet: speedup NdiscCache and make it independent on the Icmpv6L4P…
TommyPec Apr 2, 2017
b578307
internet: rescan bindings
tomhenderson Apr 2, 2017
d71e02e
wifi: Fix another valgrind issue
stavallo Apr 4, 2017
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
Prev Previous commit
Next Next commit
wifi: Rename low and high to first and last to match documentation
  • Loading branch information
Alexander Krotov committed Mar 27, 2017
commit 8aa4b81dd9d7b81b3ff59d2cad8665960bc7182f
6 changes: 3 additions & 3 deletions src/wifi/helper/wifi-helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,11 +747,11 @@ WifiHelper::SetStandard (enum WifiPhyStandard standard)
NetDeviceContainer
WifiHelper::Install (const WifiPhyHelper &phyHelper,
const WifiMacHelper &macHelper,
NodeContainer::Iterator low,
NodeContainer::Iterator high) const
NodeContainer::Iterator first,
NodeContainer::Iterator last) const
{
NetDeviceContainer devices;
for (NodeContainer::Iterator i = low; i != high; ++i)
for (NodeContainer::Iterator i = first; i != last; ++i)
{
Ptr<Node> node = *i;
Ptr<WifiNetDevice> device = CreateObject<WifiNetDevice> ();
Expand Down
4 changes: 2 additions & 2 deletions src/wifi/helper/wifi-helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,8 @@ class WifiHelper
NetDeviceContainer
virtual Install (const WifiPhyHelper &phyHelper,
const WifiMacHelper &macHelper,
NodeContainer::Iterator low,
NodeContainer::Iterator high) const;
NodeContainer::Iterator first,
NodeContainer::Iterator last) const;
/**
* \param phy the PHY helper to create PHY objects
* \param mac the MAC helper to create MAC objects
Expand Down