Skip to content
Snippets Groups Projects
Commit 9c3b5eeb authored by yanmorin's avatar yanmorin
Browse files

::iterator are object, not pointer, so don't put iter != 0
parent 5eb1fee0
No related branches found
No related tags found
No related merge requests found
...@@ -1542,7 +1542,7 @@ ManagerImpl::getAccountFromCall(const CallID& callID) ...@@ -1542,7 +1542,7 @@ ManagerImpl::getAccountFromCall(const CallID& callID)
{ {
ost::MutexLock m(_callAccountMapMutex); ost::MutexLock m(_callAccountMapMutex);
CallAccountMap::iterator iter = _callAccountMap.find(callID); CallAccountMap::iterator iter = _callAccountMap.find(callID);
if ( iter == 0 || iter == _callAccountMap.end()) { if ( iter == _callAccountMap.end()) {
return AccountNULL; return AccountNULL;
} else { } else {
return iter->second; return iter->second;
...@@ -1613,7 +1613,7 @@ Account* ...@@ -1613,7 +1613,7 @@ Account*
ManagerImpl::getAccount(const AccountID& accountID) ManagerImpl::getAccount(const AccountID& accountID)
{ {
AccountMap::iterator iter = _accountMap.find(accountID); AccountMap::iterator iter = _accountMap.find(accountID);
if ( iter == 0 || iter == _accountMap.end() ) { if ( iter == _accountMap.end() ) {
return 0; return 0;
} }
return iter->second; return iter->second;
...@@ -1633,7 +1633,7 @@ void ...@@ -1633,7 +1633,7 @@ void
ManagerImpl::initConfigAccount() { ManagerImpl::initConfigAccount() {
AccountMap::iterator iter = _accountMap.begin(); AccountMap::iterator iter = _accountMap.begin();
while ( iter != _accountMap.end() ) { while ( iter != _accountMap.end() ) {
if (iter!=0 && iter->second!=0) { if (iter->second!=0) {
iter->second->initConfig(_config); iter->second->initConfig(_config);
} }
iter++; iter++;
......
...@@ -60,7 +60,7 @@ VoIPLink::getCall(const CallID& id) ...@@ -60,7 +60,7 @@ VoIPLink::getCall(const CallID& id)
{ {
ost::MutexLock m(_callMapMutex); ost::MutexLock m(_callMapMutex);
CallMap::iterator iter = _callMap.find(id); CallMap::iterator iter = _callMap.find(id);
if ( iter != 0 && iter != _callMap.end() ) { if ( iter != _callMap.end() ) {
return iter->second; return iter->second;
} }
return 0; return 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment