- for(ItemMap::const_iterator i=items.begin(); i!=items.end(); ++i)
- if(i->second.check_type<RPNCT>())
- if(i->second.value<RPNCT>().get()==d)
- return i->first;
+ for(const auto &kvp: items)
+ if(kvp.second.check_type<RPNCT>())
+ if(kvp.second.value<RPNCT>().get()==d)
+ return kvp.first;