Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
a728f3b73e
1 changed files with 9 additions and 2 deletions
|
@ -165,9 +165,16 @@ namespace NLGUI
|
|||
|
||||
// if we over object limit, then start removing expired objects
|
||||
// this does not guarantee that max limit is reached
|
||||
for (THttpCacheMap::iterator it = _List.begin(); it != _List.end();) {
|
||||
if (it->second.Expires <= currentTime) {
|
||||
for (THttpCacheMap::iterator it = _List.begin(); it != _List.end();)
|
||||
{
|
||||
if (it->second.Expires <= currentTime)
|
||||
{
|
||||
#ifdef NL_ISO_CPP0X_AVAILABLE
|
||||
it = _List.erase(it);
|
||||
#else
|
||||
THttpCacheMap::iterator itToErase = it++;
|
||||
_List.erase(itToErase);
|
||||
#endif
|
||||
|
||||
--mustDrop;
|
||||
if (mustDrop == 0)
|
||||
|
|
Loading…
Reference in a new issue