X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcache.cpp;h=b8c71afc6744d7ef886c8483dabaa9d3f7410612;hb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;hp=d4a4ebc3857f25321fbb27d756d77aa02446d98b;hpb=e13613cecc357b0dd01ef85c7c739fd1e0bfebd2;p=builder.git

diff --git a/source/cache.cpp b/source/cache.cpp
index d4a4ebc..b8c71af 100644
--- a/source/cache.cpp
+++ b/source/cache.cpp
@@ -59,7 +59,7 @@ void write_string(IO::Base &out, const string &str)
 
 Cache::Cache(SourcePackage &p):
 	package(p),
-	filename(package.get_temp_dir()/"../cache"),
+	filename(package.get_temp_directory()/"../cache"),
 	changed(false)
 { }
 
@@ -141,12 +141,14 @@ 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;
 }