Remove most container typedefs and refactor others

[builder.git] / source / architecture.h

diff --git a/source/architecture.h b/source/architecture.h
index 5b894b1ee740d14f891b73d8ffee55701407d709..7f3c4b2a45e28b4e1d3c8900fa5e23cbb2d00bf2 100644 (file)
--- a/source/architecture.h
+++ b/source/architecture.h
@@ -21,8 +21,6 @@ public:
                Loader(Architecture &);
        };
 
-       typedef std::list<Pattern> PatternList;
-
 private:
        Builder &builder;
        std::string type;
@@ -34,7 +32,7 @@ private:
        std::string name;
        bool native;
        std::string cross_prefix;
-       std::map<std::string, PatternList> filename_patterns;
+       std::map<std::string, std::list<Pattern>> filename_patterns;
 
 public:
        Architecture(Builder &b, const std::string &spec);
@@ -54,7 +52,7 @@ public:
        const std::string &get_cross_prefix() const { return cross_prefix; }
 
        template<typename T>
-       const PatternList &get_patterns() const;
+       const std::list<Pattern> &get_patterns() const;
 
        template<typename T>
        std::string create_filename(const std::string &) const;
@@ -69,20 +67,20 @@ private:
 };
 
 template<typename T>
-inline const Architecture::PatternList &Architecture::get_patterns() const
+inline const std::list<Pattern> &Architecture::get_patterns() const
 {
        auto i = filename_patterns.find(typeid(T).name());
        if(i!=filename_patterns.end())
                return i->second;
 
-       static PatternList empty;
+       static std::list<Pattern> empty;
        return empty;
 }
 
 template<typename T>
 inline std::string Architecture::create_filename(const std::string &base) const
 {
-       const PatternList &patterns = get_patterns<T>();
+       const std::list<Pattern> &patterns = get_patterns<T>();
        return patterns.empty() ? base : patterns.front().apply(base);
 }