mirror of
https://github.com/VectorCamp/vectorscan.git
synced 2025-10-10 16:22:22 +03:00
util: switch from Boost to std::unordered set/map
This commit replaces the ue2::unordered_{set,map} types with their STL versions, with some new hashing utilities in util/hash.h. The new types ue2_unordered_set<T> and ue2_unordered_map<Key, T> default to using the ue2_hasher. The header util/ue2_containers.h has been removed, and the flat_set/map containers moved to util/flat_containers.h.
This commit is contained in:
committed by
Matthew Barr
parent
a425bb9b7c
commit
9cf66b6ac9
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2015-2016, Intel Corporation
|
||||
* Copyright (c) 2015-2017, Intel Corporation
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
@@ -36,12 +36,12 @@
|
||||
#include "ue2common.h"
|
||||
#include "popcount.h"
|
||||
#include "util/bitutils.h"
|
||||
#include "util/hash.h"
|
||||
|
||||
#include <array>
|
||||
#include <cassert>
|
||||
|
||||
#include <boost/dynamic_bitset.hpp>
|
||||
#include <boost/functional/hash/hash.hpp>
|
||||
|
||||
namespace ue2 {
|
||||
|
||||
@@ -373,7 +373,7 @@ public:
|
||||
|
||||
/// Simple hash.
|
||||
size_t hash() const {
|
||||
return boost::hash_range(std::begin(bits), std::end(bits));
|
||||
return ue2_hasher()(bits);
|
||||
}
|
||||
|
||||
/// Sentinel value meaning "no more bits", used by find_first and
|
||||
@@ -420,12 +420,17 @@ private:
|
||||
std::array<block_type, num_blocks> bits;
|
||||
};
|
||||
|
||||
/** \brief Boost-style hash free function. */
|
||||
template<size_t requested_size>
|
||||
size_t hash_value(const bitfield<requested_size> &b) {
|
||||
return b.hash();
|
||||
}
|
||||
|
||||
} // namespace ue2
|
||||
|
||||
namespace std {
|
||||
|
||||
template<size_t requested_size>
|
||||
struct hash<ue2::bitfield<requested_size>> {
|
||||
size_t operator()(const ue2::bitfield<requested_size> &b) const {
|
||||
return b.hash();
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace std
|
||||
|
||||
#endif // BITFIELD_H
|
||||
|
Reference in New Issue
Block a user