Remove most container typedefs and refactor others

[builder.git] / source / cache.cpp

diff --git a/source/cache.cpp b/source/cache.cpp
index 57b16d118ecd01cc27f99626e89cd9a5866ca475..229783a002b92cf9b966e0459f010b028a1df490 100644 (file)
--- a/source/cache.cpp
+++ b/source/cache.cpp
@@ -65,7 +65,7 @@ Cache::Cache(SourcePackage &p):
 
 void Cache::set_value(const Target *tgt, const string &k, const string &v)
 {
-       ValueList vl;
+       Values vl;
        vl.push_back(v);
        set_values(tgt, k, vl);
 }
@@ -75,13 +75,13 @@ void Cache::append_value(const Target *tgt, const string &k, const string &v)
        Key key(tgt->get_name(), k);
        auto i = data.find(key);
        if(i==data.end())
-               i = data.insert({ key, ValueList() }).first;
+               i = data.insert({ key, Values() }).first;
        i->second.push_back(v);
        changed = true;
        package.get_builder().get_logger().log("cache", format("Updated key %s %s+ %s", tgt->get_name(), k, v));
 }
 
-void Cache::set_values(const Target *tgt, const string &k, const ValueList &v)
+void Cache::set_values(const Target *tgt, const string &k, const Values &v)
 {
        data[Key(tgt->get_name(), k)] = v;
        changed = true;
@@ -90,13 +90,13 @@ void Cache::set_values(const Target *tgt, const string &k, const ValueList &v)
 
 const string &Cache::get_value(const Target *tgt, const string &k)
 {
-       const ValueList &values = get_values(tgt, k);
+       const Values &values = get_values(tgt, k);
        if(values.empty())
                throw logic_error("values.empty()");
        return values.front();
 }
 
-const Cache::ValueList &Cache::get_values(const Target *tgt, const string &k)
+const Cache::Values &Cache::get_values(const Target *tgt, const string &k)
 {
        return get_item(data, Key(tgt->get_name(), k));
 }
@@ -120,7 +120,7 @@ void Cache::load()
                        key.second = read_string(in);
                        if(key.first.empty() || key.second.empty())
                                break;
-                       ValueList &values = data[key];
+                       Values &values = data[key];
                        for(unsigned count = read_count(in); count; --count)
                                values.push_back(read_string(in));
                        package.get_builder().get_logger().log("cache", format("Loaded key %s %s: %s", key.first, key.second, join(values.begin(), values.end())));