King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

STL guaranties that operator* and operator. are defined for iterators.

Browse source 
operator-> is added as a requirement by the ISO/ANSI commitee standarzing C++ from july 1995.
So old implementation might fail using operator-> on iterator.
Converting every "itr->first" into "(*itr).first"

git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@802 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
clitte_bbt 2007-01-03 21:50:07 +00:00
parent c54349f058
commit 347e1f95f8
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/loki/CachedFactory.h
View file

@ -324,10 +324,10 @@ namespace Loki
// inserting the swapped pair into a multimap // inserting the swapped pair into a multimap
SwappedHitMap copyMap; SwappedHitMap copyMap;
for(HitMapItr itr = m_mHitCount.begin(); itr != m_mHitCount.end(); ++itr) for(HitMapItr itr = m_mHitCount.begin(); itr != m_mHitCount.end(); ++itr)
copyMap.insert(SwappedPair(itr->second, itr->first)); copyMap.insert(SwappedPair((*itr).second, (*itr).first));
if(copyMap.rbegin()->first == 0) // the higher score is 0 ... if((*copyMap.rbegin()).first == 0) // the higher score is 0 ...
throw EvictionException(); // there is no key evict throw EvictionException(); // there is no key evict
return copyMap.begin()->second; return (*copyMap.begin()).second;
} }
}; };
@ -787,7 +787,7 @@ namespace Loki
typename ObjVector::iterator objItr; typename ObjVector::iterator objItr;
for(objVectorItr=fromKeyToObjVector.begin();objVectorItr!=fromKeyToObjVector.end();++objVectorItr) for(objVectorItr=fromKeyToObjVector.begin();objVectorItr!=fromKeyToObjVector.end();++objVectorItr)
{ {
ObjVector &v(objVectorItr->second); ObjVector &v((*objVectorItr).second);
objItr = remove_if(v.begin(), v.end(), std::bind2nd(std::equal_to<AbstractProduct*>(), pProduct)); objItr = remove_if(v.begin(), v.end(), std::bind2nd(std::equal_to<AbstractProduct*>(), pProduct));
if(objItr != v.end()) // we found the vector containing pProduct and removed it if(objItr != v.end()) // we found the vector containing pProduct and removed it
{ {
@ -1139,7 +1139,7 @@ namespace Loki
if(itr == providedObjects.end()) if(itr == providedObjects.end())
throw CacheException(); throw CacheException();
onRelease(pProduct); onRelease(pProduct);
ReleaseObjectFromContainer(getContainerFromKey(itr->second), pProduct); ReleaseObjectFromContainer(getContainerFromKey((*itr).second), pProduct);
providedObjects.erase(itr); providedObjects.erase(itr);
} }