diff --git a/src/metadata.cpp b/src/metadata.cpp index 992c46d6..c22c2a1e 100644 --- a/src/metadata.cpp +++ b/src/metadata.cpp @@ -30,8 +30,6 @@ #include #include -#include - using namespace std; namespace boss { @@ -536,13 +534,13 @@ namespace boss { return !(*this < rhs); } - boost::unordered_set Plugin::FormIDs() const { + std::set Plugin::FormIDs() const { return formIDs; } - boost::unordered_set Plugin::OverlapFormIDs(const Plugin& plugin) const { - boost::unordered_set otherFormIDs = plugin.FormIDs(); - boost::unordered_set overlap; + std::set Plugin::OverlapFormIDs(const Plugin& plugin) const { + set otherFormIDs = plugin.FormIDs(); + set overlap; set_intersection(formIDs.begin(), formIDs.end(), otherFormIDs.begin(), otherFormIDs.end(), inserter(overlap, overlap.begin())); @@ -568,7 +566,7 @@ namespace boss { } if (find(requirements.begin(), requirements.end(), plugin) != requirements.end()) return true; - if (find(loadAfter.begin(), loadAfter.end(), plugin) != requirements.end()) + if (find(loadAfter.begin(), loadAfter.end(), plugin) != loadAfter.end()) return true; return false; } diff --git a/src/metadata.h b/src/metadata.h index be401221..de6db84c 100644 --- a/src/metadata.h +++ b/src/metadata.h @@ -31,8 +31,6 @@ #include #include -#include - namespace boss { @@ -59,19 +57,6 @@ namespace boss { uint32_t id; }; - - struct FormID_hash - : std::unary_function -{ - std::size_t operator()(FormID const& p) const - { - std::size_t seed = 0; - boost::hash_combine(seed, p.Plugin()); - boost::hash_combine(seed, p.Id()); - return seed; - } -}; - class ConditionalData { public: ConditionalData(); @@ -158,7 +143,7 @@ namespace boss { std::list Messages() const; std::set Tags() const; - boost::unordered_set FormIDs() const; + std::set FormIDs() const; std::vector Masters() const; bool IsMaster() const; //Checks master bit flag. std::string Version() const; @@ -187,7 +172,7 @@ namespace boss { bool operator >= (const Plugin& rhs) const; //Load ordering functions. - boost::unordered_set OverlapFormIDs(const Plugin& plugin) const; + std::set OverlapFormIDs(const Plugin& plugin) const; bool MustLoadAfter(const Plugin& plugin) const; //Checks masters, reqs and loadAfter. //Validity checks. @@ -203,7 +188,7 @@ namespace boss { std::set tags; std::vector masters; - boost::unordered_set formIDs; + std::set formIDs; std::string version; //Obtained from description field. bool isMaster; };