From 9c3b5eeb7dcb2d5ed491ee7e19a58f3af9aecd5d Mon Sep 17 00:00:00 2001
From: yanmorin <yanmorin>
Date: Wed, 5 Apr 2006 15:45:56 +0000
Subject: [PATCH] ::iterator are object, not pointer, so don't put iter != 0
---
src/managerimpl.cpp | 6 +++---
src/voIPLink.cpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 8358521828..f111a2911a 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -1542,7 +1542,7 @@ ManagerImpl::getAccountFromCall(const CallID& callID)
{
ost::MutexLock m(_callAccountMapMutex);
CallAccountMap::iterator iter = _callAccountMap.find(callID);
- if ( iter == 0 || iter == _callAccountMap.end()) {
+ if ( iter == _callAccountMap.end()) {
return AccountNULL;
} else {
return iter->second;
@@ -1613,7 +1613,7 @@ Account*
ManagerImpl::getAccount(const AccountID& accountID)
{
AccountMap::iterator iter = _accountMap.find(accountID);
- if ( iter == 0 || iter == _accountMap.end() ) {
+ if ( iter == _accountMap.end() ) {
return 0;
}
return iter->second;
@@ -1633,7 +1633,7 @@ void
ManagerImpl::initConfigAccount() {
AccountMap::iterator iter = _accountMap.begin();
while ( iter != _accountMap.end() ) {
- if (iter!=0 && iter->second!=0) {
+ if (iter->second!=0) {
iter->second->initConfig(_config);
}
iter++;
diff --git a/src/voIPLink.cpp b/src/voIPLink.cpp
index 4612ae53fc..02dd2410fa 100644
--- a/src/voIPLink.cpp
+++ b/src/voIPLink.cpp
@@ -60,7 +60,7 @@ VoIPLink::getCall(const CallID& id)
{
ost::MutexLock m(_callMapMutex);
CallMap::iterator iter = _callMap.find(id);
- if ( iter != 0 && iter != _callMap.end() ) {
+ if ( iter != _callMap.end() ) {
return iter->second;
}
return 0;
--
GitLab