79,80c79,80
< reqLookupResult = cachedLocations.find(line_addr);
< bool is_hit = (reqLookupResult != cachedLocations.end());
---
> reqLookupResult.it = cachedLocations.find(line_addr);
> bool is_hit = (reqLookupResult.it != cachedLocations.end());
89,91c89,93
< if (!is_hit)
< reqLookupResult = cachedLocations.emplace(line_addr, SnoopItem()).first;
< SnoopItem& sf_item = reqLookupResult->second;
---
> if (!is_hit) {
> reqLookupResult.it =
> cachedLocations.emplace(line_addr, SnoopItem()).first;
> }
> SnoopItem& sf_item = reqLookupResult.it->second;
97c99
< retryItem = sf_item;
---
> reqLookupResult.retryItem = sf_item;
158c160
< if (reqLookupResult != cachedLocations.end()) {
---
> if (reqLookupResult.it != cachedLocations.end()) {
165c167
< assert(reqLookupResult->first == line_addr);
---
> assert(reqLookupResult.it->first == line_addr);
166a169
> SnoopItem retry_item = reqLookupResult.retryItem;
170c173
< reqLookupResult->second = retryItem;
---
> reqLookupResult.it->second = retry_item;
173c176
< __func__, retryItem.requested, retryItem.holder);
---
> __func__, retry_item.requested, retry_item.holder);
176c179
< eraseIfNullEntry(reqLookupResult);
---
> eraseIfNullEntry(reqLookupResult.it);