X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.h;h=4642080c59307ab897fabb76d22c81d26ea70aed;hb=d1f9551e05c9d341149eb490e05b1465d3d6b711;hp=776de858b03fcc2b587771e73f9322ab29f1d815;hpb=564160e126f525dda52f27044d29b479088da191;p=builder.git diff --git a/source/architecture.h b/source/architecture.h index 776de85..4642080 100644 --- a/source/architecture.h +++ b/source/architecture.h @@ -27,12 +27,12 @@ private: std::string cpu; std::string fpu; std::string system; - unsigned bits; + unsigned bits = 0; std::string toolchain; std::string name; - bool native; + bool native = false; std::string cross_prefix; - std::map> filename_patterns; + std::map> filename_patterns; public: Architecture(Builder &b, const std::string &spec); @@ -52,7 +52,7 @@ public: const std::string &get_cross_prefix() const { return cross_prefix; } template - const std::list &get_patterns() const; + const std::vector &get_patterns() const; template std::string create_filename(const std::string &) const; @@ -67,20 +67,20 @@ private: }; template -inline const std::list &Architecture::get_patterns() const +inline const std::vector &Architecture::get_patterns() const { auto i = filename_patterns.find(typeid(T).name()); if(i!=filename_patterns.end()) return i->second; - static std::list empty; + static std::vector empty; return empty; } template inline std::string Architecture::create_filename(const std::string &base) const { - const std::list &patterns = get_patterns(); + const std::vector &patterns = get_patterns(); return patterns.empty() ? base : patterns.front().apply(base); }