- for(std::map<string, VariableDeclaration *>::const_iterator i=block.variables.begin(); i!=block.variables.end(); ++i)
- append(format("Variable: %%%d %s %s", get_label(*i->second), i->second->type, i->first));
+ for(const auto &kvp: block.variables)
+ append(format("Variable: %%%d %s %s", get_label(*kvp.second), kvp.second->type, kvp.first));