diff --git a/src/internet/model/candidate-queue.cc b/src/internet/model/candidate-queue.cc index 569752fa4..b39d867c9 100644 --- a/src/internet/model/candidate-queue.cc +++ b/src/internet/model/candidate-queue.cc @@ -58,8 +58,6 @@ operator<<(std::ostream& os, const SPFVertex::VertexType& t) std::ostream& operator<<(std::ostream& os, const CandidateQueue& q) { - typedef CandidateQueue::CandidateList_t List_t; - typedef List_t::const_iterator CIter_t; const CandidateQueue::CandidateList_t& list = q.m_candidates; os << "*** CandidateQueue Begin () ***" << std::endl; diff --git a/src/internet/model/global-route-manager-impl.cc b/src/internet/model/global-route-manager-impl.cc index 3d85c5190..a5d3bb00a 100644 --- a/src/internet/model/global-route-manager-impl.cc +++ b/src/internet/model/global-route-manager-impl.cc @@ -62,7 +62,6 @@ operator<<(std::ostream& os, const SPFVertex::NodeExit_t& exit) std::ostream& operator<<(std::ostream& os, const SPFVertex::ListOfSPFVertex_t& vs) { - typedef SPFVertex::ListOfSPFVertex_t::const_iterator CIter_t; os << "{"; for (auto iter = vs.begin(); iter != vs.end();) { @@ -302,7 +301,6 @@ SPFVertex::NodeExit_t SPFVertex::GetRootExitDirection(uint32_t i) const { NS_LOG_FUNCTION(this << i); - typedef ListOfNodeExit_t::const_iterator CIter_t; NS_ASSERT_MSG(i < m_ecmpRootExits.size(), "Index out-of-range when accessing SPFVertex::m_ecmpRootExits!"); diff --git a/src/olsr/model/olsr-routing-protocol.cc b/src/olsr/model/olsr-routing-protocol.cc index 58ee4c2c0..08efc7320 100644 --- a/src/olsr/model/olsr-routing-protocol.cc +++ b/src/olsr/model/olsr-routing-protocol.cc @@ -2167,7 +2167,6 @@ RoutingProtocol::PopulateTwoHopNeighborSet(const olsr::MessageHeader& msg, continue; } - typedef std::vector LinkMessageVec; for (auto linkMessage = hello.linkMessages.begin(); linkMessage != hello.linkMessages.end(); linkMessage++) { @@ -2250,7 +2249,6 @@ RoutingProtocol::PopulateMprSelectorSet(const olsr::MessageHeader& msg, Time now = Simulator::Now(); - typedef std::vector LinkMessageVec; for (auto linkMessage = hello.linkMessages.begin(); linkMessage != hello.linkMessages.end(); linkMessage++) { diff --git a/src/wimax/model/simple-ofdm-wimax-channel.cc b/src/wimax/model/simple-ofdm-wimax-channel.cc index 8650a0f42..dd498817c 100644 --- a/src/wimax/model/simple-ofdm-wimax-channel.cc +++ b/src/wimax/model/simple-ofdm-wimax-channel.cc @@ -216,7 +216,6 @@ int64_t SimpleOfdmWimaxChannel::AssignStreams(int64_t stream) { int64_t currentStream = stream; - typedef std::list> PhyList; for (auto i = m_phyList.begin(); i != m_phyList.end(); i++) { Ptr simpleOfdm = (*i);