From 2740f79a4eb76cb15cdc831764902e8031ba7f4d Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> Date: Tue, 13 Aug 2013 16:51:14 -0400 Subject: [PATCH] * #28351: iaxvoiplink: use range-based for loops --- daemon/src/iax/iaxvoiplink.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/daemon/src/iax/iaxvoiplink.cpp b/daemon/src/iax/iaxvoiplink.cpp index 0fc11fce47..e59c677d7b 100644 --- a/daemon/src/iax/iaxvoiplink.cpp +++ b/daemon/src/iax/iaxvoiplink.cpp @@ -105,8 +105,8 @@ IAXVoIPLink::terminate() sfl::ScopedLock m(iaxCallMapMutex_); - for (IAXCallMap::iterator iter = iaxCallMap_.begin(); iter != iaxCallMap_.end(); ++iter) { - IAXCall *call = static_cast<IAXCall*>(iter->second); + for (auto &iter : iaxCallMap_) { + IAXCall *call = static_cast<IAXCall*>(iter.second); if (call) { sfl::ScopedLock lock(mutexIAX_); @@ -182,8 +182,8 @@ IAXVoIPLink::getCallIDs() void IAXVoIPLink::sendAudioFromMic() { - for (IAXCallMap::const_iterator iter = iaxCallMap_.begin(); iter != iaxCallMap_.end() ; ++iter) { - IAXCall *currentCall = static_cast<IAXCall*>(iter->second); + for (const auto &iter : iaxCallMap_) { + IAXCall *currentCall = static_cast<IAXCall*>(iter.second); if (!currentCall or currentCall->getState() != Call::ACTIVE) continue; @@ -460,9 +460,8 @@ IAXVoIPLink::clearIaxCallMap() { sfl::ScopedLock m(iaxCallMapMutex_); - for (IAXCallMap::const_iterator iter = iaxCallMap_.begin(); - iter != iaxCallMap_.end(); ++iter) - delete iter->second; + for (const auto &iter : iaxCallMap_) + delete iter.second; iaxCallMap_.clear(); @@ -540,8 +539,8 @@ IAXVoIPLink::iaxFindCallBySession(iax_session* session) { sfl::ScopedLock m(iaxCallMapMutex_); - for (IAXCallMap::const_iterator iter = iaxCallMap_.begin(); iter != iaxCallMap_.end(); ++iter) { - IAXCall* call = static_cast<IAXCall*>(iter->second); + for (const auto &iter : iaxCallMap_) { + IAXCall* call = static_cast<IAXCall*>(iter.second); if (call and call->session == session) return call; -- GitLab