X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcache.cpp;h=61a4cb4e6d6f9657f22e5a2b458f6ddfdd989234;hb=690b9c5f340504517cf6ba8aad0c168dcdff4efa;hp=de4643c4bf23abe1f9eb640a90756503d2e3313e;hpb=c7df14c38a87ceca13df47fa700d3f9fa250be91;p=builder.git diff --git a/source/cache.cpp b/source/cache.cpp index de4643c..61a4cb4 100644 --- a/source/cache.cpp +++ b/source/cache.cpp @@ -73,7 +73,7 @@ void Cache::set_value(const Target *tgt, const string &k, const string &v) void Cache::append_value(const Target *tgt, const string &k, const string &v) { Key key(tgt->get_name(), k); - DataMap::iterator i = data.find(key); + auto i = data.find(key); if(i==data.end()) i = data.insert(DataMap::value_type(key, ValueList())).first; i->second.push_back(v); @@ -141,13 +141,13 @@ void Cache::save() const package.get_builder().get_logger().log("files", format("Writing %s", filename)); IO::BufferedFile out(filename.str(), IO::M_WRITE); - for(DataMap::const_iterator i=data.begin(); i!=data.end(); ++i) + for(const auto &kvp: data) { - write_string(out, i->first.first); - write_string(out, i->first.second); - write_count(out, i->second.size()); - for(ValueList::const_iterator j=i->second.begin(); j!=i->second.end(); ++j) - write_string(out, *j); + write_string(out, kvp.first.first); + write_string(out, kvp.first.second); + write_count(out, kvp.second.size()); + for(const string &v: kvp.second) + write_string(out, v); } changed = false;