2c2
< * Copyright (c) 2012, 2014 ARM Limited
---
> * Copyright (c) 2012, 2014, 2018 ARM Limited
244c244
< const auto& r = addrMap.find(addr);
---
> const auto& r = addrMap.contains(addr);
301c301
< const auto& m = addrMap.find(addr);
---
> const auto& m = addrMap.contains(addr);
317c317
< const auto& m = addrMap.find(addr);
---
> const auto& m = addrMap.contains(addr);
409c409
< const auto& m = addrMap.find(lal_addr[i]);
---
> const auto& m = addrMap.contains(lal_addr[i]);