diff --git a/src/core/model/simulator.h b/src/core/model/simulator.h index 721d74164..506a289f4 100644 --- a/src/core/model/simulator.h +++ b/src/core/model/simulator.h @@ -62,7 +62,7 @@ class Scheduler; * expire first. * * A simple example of how to use the Simulator class to schedule events - * is shown in sample-simulator.cc :: + * is shown in sample-simulator.cc: * \include src/core/examples/sample-simulator.cc * * \todo Define what the simulation or event context means. diff --git a/src/core/test/hash-test-suite.cc b/src/core/test/hash-test-suite.cc index a33d5f3cc..0032721df 100644 --- a/src/core/test/hash-test-suite.cc +++ b/src/core/test/hash-test-suite.cc @@ -45,7 +45,7 @@ private: virtual void DoRun (void); }; // class HashTestCase -HashTestCase::HashTestCase (const std:: string name) +HashTestCase::HashTestCase (const std::string name) : TestCase (name), key ("The quick brown fox jumped over the lazy dogs.") { diff --git a/src/internet/model/icmpv6-l4-protocol.h b/src/internet/model/icmpv6-l4-protocol.h index 6d2fdf5ac..5f5e03b47 100644 --- a/src/internet/model/icmpv6-l4-protocol.h +++ b/src/internet/model/icmpv6-l4-protocol.h @@ -393,7 +393,7 @@ public: * \brief Send a Router Solicitation. * \param src link-local source address * \param dst destination address (usealy ff02::2 i.e all-routers) - * \param hardwareAddress link-layer address (SHOULD be included if src is not :: + * \param hardwareAddress link-layer address (SHOULD be included if src is not ::) */ void SendRS (Ipv6Address src, Ipv6Address dst, Address hardwareAddress); diff --git a/src/internet/model/ipv6-pmtu-cache.h b/src/internet/model/ipv6-pmtu-cache.h index 173231371..ea306e98d 100644 --- a/src/internet/model/ipv6-pmtu-cache.h +++ b/src/internet/model/ipv6-pmtu-cache.h @@ -111,7 +111,7 @@ private: /** * \brief Container of the IPv6 PMTU data (Ipv6 destination address and expiration event). */ - typedef std::map ::iterator pathMtuTimerIter; + typedef std::map::iterator pathMtuTimerIter; /** * \brief Path MTU Expiration table diff --git a/src/lte/model/lte-harq-phy.cc b/src/lte/model/lte-harq-phy.cc index f727c0aa0..9e8c23757 100644 --- a/src/lte/model/lte-harq-phy.cc +++ b/src/lte/model/lte-harq-phy.cc @@ -56,7 +56,7 @@ LteHarqPhy::SubframeIndication (uint32_t frameNo, uint32_t subframeNo) NS_LOG_FUNCTION (this); // left shift UL HARQ buffers - std::map >:: iterator it; + std::map >::iterator it; for (it = m_miUlHarqProcessesInfoMap.begin (); it != m_miUlHarqProcessesInfoMap.end (); it++) { (*it).second.erase ((*it).second.begin ()); diff --git a/src/lte/test/test-asn1-encoding.cc b/src/lte/test/test-asn1-encoding.cc index 6ffbc955d..3396b944e 100644 --- a/src/lte/test/test-asn1-encoding.cc +++ b/src/lte/test/test-asn1-encoding.cc @@ -100,12 +100,12 @@ protected: Ptr packet; }; -RrcHeaderTestCase :: RrcHeaderTestCase (std::string s) : TestCase (s) +RrcHeaderTestCase::RrcHeaderTestCase (std::string s) : TestCase (s) { } LteRrcSap::RadioResourceConfigDedicated -RrcHeaderTestCase :: CreateRadioResourceConfigDedicated () +RrcHeaderTestCase::CreateRadioResourceConfigDedicated () { LteRrcSap::RadioResourceConfigDedicated rrd; @@ -159,7 +159,7 @@ RrcHeaderTestCase :: CreateRadioResourceConfigDedicated () } void -RrcHeaderTestCase :: AssertEqualRadioResourceConfigDedicated (LteRrcSap::RadioResourceConfigDedicated rrcd1, LteRrcSap::RadioResourceConfigDedicated rrcd2) +RrcHeaderTestCase::AssertEqualRadioResourceConfigDedicated (LteRrcSap::RadioResourceConfigDedicated rrcd1, LteRrcSap::RadioResourceConfigDedicated rrcd2) { NS_TEST_ASSERT_MSG_EQ (rrcd1.srbToAddModList.size (), rrcd2.srbToAddModList.size (),"SrbToAddModList different sizes"); diff --git a/src/network/utils/ascii-file.cc b/src/network/utils/ascii-file.cc index 82a16bc7e..aeeb0cfa0 100644 --- a/src/network/utils/ascii-file.cc +++ b/src/network/utils/ascii-file.cc @@ -80,9 +80,9 @@ AsciiFile::Read (std::string& line) } bool -AsciiFile:: Diff (std::string const & f1, - std::string const & f2, - uint64_t & lineNumber) +AsciiFile::Diff (std::string const & f1, + std::string const & f2, + uint64_t & lineNumber) { AsciiFile ascii1, ascii2; ascii1.Open (f1, std::ios::in); diff --git a/src/spectrum/model/spectrum-value.cc b/src/spectrum/model/spectrum-value.cc index edc4f7770..2fe0430e0 100644 --- a/src/spectrum/model/spectrum-value.cc +++ b/src/spectrum/model/spectrum-value.cc @@ -39,13 +39,13 @@ SpectrumValue::SpectrumValue (Ptr sof) } double& -SpectrumValue:: operator[] (size_t index) +SpectrumValue::operator[] (size_t index) { return m_values.at (index); } const double& -SpectrumValue:: operator[] (size_t index) const +SpectrumValue::operator[] (size_t index) const { return m_values.at (index); } @@ -598,28 +598,28 @@ Log (const SpectrumValue& arg) } SpectrumValue& -SpectrumValue:: operator+= (const SpectrumValue& rhs) +SpectrumValue::operator+= (const SpectrumValue& rhs) { Add (rhs); return *this; } SpectrumValue& -SpectrumValue:: operator-= (const SpectrumValue& rhs) +SpectrumValue::operator-= (const SpectrumValue& rhs) { Subtract (rhs); return *this; } SpectrumValue& -SpectrumValue:: operator*= (const SpectrumValue& rhs) +SpectrumValue::operator*= (const SpectrumValue& rhs) { Multiply (rhs); return *this; } SpectrumValue& -SpectrumValue:: operator/= (const SpectrumValue& rhs) +SpectrumValue::operator/= (const SpectrumValue& rhs) { Divide (rhs); return *this; @@ -627,28 +627,28 @@ SpectrumValue:: operator/= (const SpectrumValue& rhs) SpectrumValue& -SpectrumValue:: operator+= (double rhs) +SpectrumValue::operator+= (double rhs) { Add (rhs); return *this; } SpectrumValue& -SpectrumValue:: operator-= (double rhs) +SpectrumValue::operator-= (double rhs) { Subtract (rhs); return *this; } SpectrumValue& -SpectrumValue:: operator*= (double rhs) +SpectrumValue::operator*= (double rhs) { Multiply (rhs); return *this; } SpectrumValue& -SpectrumValue:: operator/= (double rhs) +SpectrumValue::operator/= (double rhs) { Divide (rhs); return *this; @@ -656,7 +656,7 @@ SpectrumValue:: operator/= (double rhs) SpectrumValue& -SpectrumValue:: operator= (double rhs) +SpectrumValue::operator= (double rhs) { Values::iterator it1 = m_values.begin (); @@ -671,7 +671,7 @@ SpectrumValue:: operator= (double rhs) SpectrumValue -SpectrumValue:: operator<< (int n) const +SpectrumValue::operator<< (int n) const { SpectrumValue res = *this; res.ShiftLeft (n); @@ -679,7 +679,7 @@ SpectrumValue:: operator<< (int n) const } SpectrumValue -SpectrumValue:: operator>> (int n) const +SpectrumValue::operator>> (int n) const { SpectrumValue res = *this; res.ShiftRight (n); diff --git a/src/wave/test/mac-extension-test-suite.cc b/src/wave/test/mac-extension-test-suite.cc index 2c0d2d16a..03b48cf28 100644 --- a/src/wave/test/mac-extension-test-suite.cc +++ b/src/wave/test/mac-extension-test-suite.cc @@ -189,7 +189,7 @@ ChannelCoordinationTestCase::DoRun () Simulator::Schedule (MilliSeconds (5), &ChannelCoordinationTestCase::TestIntervalAfter, this, true, false, false); Simulator::Schedule (MilliSeconds (50), &ChannelCoordinationTestCase::TestIntervalAfter, this, false, true, true); Simulator::Schedule (MilliSeconds (51), &ChannelCoordinationTestCase::TestIntervalAfter, this, false, true, true); - Simulator::Schedule (MilliSeconds (53), &ChannelCoordinationTestCase:: TestIntervalAfter, this, false, true, true); + Simulator::Schedule (MilliSeconds (53), &ChannelCoordinationTestCase::TestIntervalAfter, this, false, true, true); Simulator::Schedule (MilliSeconds (54), &ChannelCoordinationTestCase::TestIntervalAfter, this, false, true, false); Simulator::Schedule (MilliSeconds (55), &ChannelCoordinationTestCase::TestIntervalAfter, this, false, true, false); Simulator::Schedule (MilliSeconds (100), &ChannelCoordinationTestCase::TestIntervalAfter, this, true, false, true); @@ -200,7 +200,7 @@ ChannelCoordinationTestCase::DoRun () Simulator::Schedule (MilliSeconds (205), &ChannelCoordinationTestCase::TestIntervalAfter, this, true, false, false); Simulator::Schedule (MilliSeconds (250), &ChannelCoordinationTestCase::TestIntervalAfter, this, false, true, true); Simulator::Schedule (MilliSeconds (251), &ChannelCoordinationTestCase::TestIntervalAfter, this, false, true, true); - Simulator::Schedule (MilliSeconds (253), &ChannelCoordinationTestCase:: TestIntervalAfter, this, false, true, true); + Simulator::Schedule (MilliSeconds (253), &ChannelCoordinationTestCase::TestIntervalAfter, this, false, true, true); Simulator::Schedule (MilliSeconds (254), &ChannelCoordinationTestCase::TestIntervalAfter, this, false, true, false); Simulator::Schedule (MilliSeconds (255), &ChannelCoordinationTestCase::TestIntervalAfter, this, false, true, false); Simulator::Schedule (MilliSeconds (300), &ChannelCoordinationTestCase::TestIntervalAfter, this, true, false, true);