From 7c4f42fbf11a5ff2fad23b5c5bf71408d85c9ab2 Mon Sep 17 00:00:00 2001 From: Kirill Andreev Date: Fri, 23 Oct 2009 16:22:56 +0400 Subject: [PATCH] Mesh: fixed coding style --- src/devices/mesh/dot11s/hwmp-protocol.cc | 8 ++++---- src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc | 4 +--- src/devices/mesh/dot11s/peer-management-protocol.cc | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/devices/mesh/dot11s/hwmp-protocol.cc b/src/devices/mesh/dot11s/hwmp-protocol.cc index b333e5801..7c3883d69 100644 --- a/src/devices/mesh/dot11s/hwmp-protocol.cc +++ b/src/devices/mesh/dot11s/hwmp-protocol.cc @@ -763,7 +763,7 @@ HwmpProtocol::MakePathError (std::vector destinations) void HwmpProtocol::InitiatePathError(PathError perr) { - for (HwmpProtocolMacMap::const_iterator i = m_interfaces.begin (); i != m_interfaces.end (); i ++) + for (HwmpProtocolMacMap::const_iterator i = m_interfaces.begin (); i != m_interfaces.end (); i ++) { std::vector receivers_for_interface; for (unsigned int j = 0; j < perr.receivers.size (); j ++) @@ -779,7 +779,7 @@ HwmpProtocol::InitiatePathError(PathError perr) void HwmpProtocol::ForwardPathError(PathError perr) { - for (HwmpProtocolMacMap::const_iterator i = m_interfaces.begin (); i != m_interfaces.end (); i ++) + for (HwmpProtocolMacMap::const_iterator i = m_interfaces.begin (); i != m_interfaces.end (); i ++) { std::vector receivers_for_interface; for (unsigned int j = 0; j < perr.receivers.size (); j ++) @@ -896,7 +896,7 @@ void HwmpProtocol::ReactivePathResolved (Mac48Address dst) { std::map::iterator i = m_preqTimeouts.find (dst); - if (i != m_preqTimeouts.end ()) + if (i != m_preqTimeouts.end ()) { m_routeDiscoveryTimeCallback (Simulator::Now () - i->second.whenScheduled); } @@ -985,7 +985,7 @@ HwmpProtocol::RetryPathDiscovery (Mac48Address dst, uint8_t numOfRetry) packet = DequeueFirstPacketByDst (dst); } std::map::iterator i = m_preqTimeouts.find (dst); - NS_ASSERT (i != m_preqTimeouts.end ()); + NS_ASSERT (i != m_preqTimeouts.end ()); m_routeDiscoveryTimeCallback (Simulator::Now () - i->second.whenScheduled); m_preqTimeouts.erase (i); return; diff --git a/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc b/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc index 0cde19382..88346ca68 100644 --- a/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc +++ b/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc @@ -77,9 +77,7 @@ IeBeaconTiming::GetNeighboursTimingElementsList () return m_neighbours; } void -IeBeaconTiming::AddNeighboursTimingElementUnit (uint16_t aid, Time last_beacon, //MicroSeconds! - Time beacon_interval //MicroSeconds! -) +IeBeaconTiming::AddNeighboursTimingElementUnit (uint16_t aid, Time last_beacon, Time beacon_interval) { if (m_numOfUnits == 50) { diff --git a/src/devices/mesh/dot11s/peer-management-protocol.cc b/src/devices/mesh/dot11s/peer-management-protocol.cc index 63a512f63..ae95c1dfc 100644 --- a/src/devices/mesh/dot11s/peer-management-protocol.cc +++ b/src/devices/mesh/dot11s/peer-management-protocol.cc @@ -400,7 +400,7 @@ PeerManagementProtocol::DoShiftBeacon (uint32_t interface) continue; } //Beacon interval is stored in TU's - if (((*j)->GetBeaconInterval ()) != TimeToTu(beaconInterval->second)) + if (((*j)->GetBeaconInterval ()) != TimeToTu (beaconInterval->second)) { continue; }