tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix swap(fixed_vector) usages.

Browse Source
This commit is contained in:
levlam 2022-02-21 05:49:59 +03:00
parent f0a2ccd0fb
commit c9c9a73499
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tdutils/td/utils/FlatHashMap.h
View File

@ -14,13 +14,13 @@
namespace td { namespace td {
template <class KeyT, class ValueT, class HashT = std::hash<KeyT>, class EqT = std::equal_to<KeyT>> template <class KeyT, class ValueT, class HashT = std::hash<KeyT>, class EqT = std::equal_to<KeyT>>
//using FlatHashMap = FlatHashMapImpl<KeyT, ValueT, HashT, EqT>; using FlatHashMap = FlatHashMapImpl<KeyT, ValueT, HashT, EqT>;
using FlatHashMap = FlatHashMapChunks<KeyT, ValueT, HashT, EqT>; //using FlatHashMap = FlatHashMapChunks<KeyT, ValueT, HashT, EqT>;
//using FlatHashMap = std::unordered_map<KeyT, ValueT, HashT, EqT>; //using FlatHashMap = std::unordered_map<KeyT, ValueT, HashT, EqT>;
template <class KeyT, class HashT = std::hash<KeyT>, class EqT = std::equal_to<KeyT>> template <class KeyT, class HashT = std::hash<KeyT>, class EqT = std::equal_to<KeyT>>
//using FlatHashSet = FlatHashSetImpl<KeyT, HashT, EqT>; using FlatHashSet = FlatHashSetImpl<KeyT, HashT, EqT>;
using FlatHashSet = FlatHashSetChunks<KeyT, HashT, EqT>; //using FlatHashSet = FlatHashSetChunks<KeyT, HashT, EqT>;
//using FlatHashSet = std::unordered_set<KeyT, HashT, EqT>; //using FlatHashSet = std::unordered_set<KeyT, HashT, EqT>;
} // namespace td } // namespace td

9
tdutils/td/utils/FlatHashMapChunks.h
View File

@ -243,10 +243,9 @@ class FlatHashTableChunks {
return *this; return *this;
} }
void swap(FlatHashTableChunks &other) noexcept { void swap(FlatHashTableChunks &other) noexcept {
using std::swap; nodes_.swap(other.nodes_);
swap(nodes_, other.nodes_); chunks_.swap(other.chunks_);
swap(chunks_, other.chunks_); std::swap(used_nodes_, other.used_nodes_);
swap(used_nodes_, other.used_nodes_);
} }
~FlatHashTableChunks() = default; ~FlatHashTableChunks() = default;
@ -493,7 +492,7 @@ class FlatHashTableChunks {
CHECK(new_size >= Chunk::CHUNK_SIZE); CHECK(new_size >= Chunk::CHUNK_SIZE);
fixed_vector<Node> old_nodes(new_size); fixed_vector<Node> old_nodes(new_size);
fixed_vector<Chunk> chunks(new_size / Chunk::CHUNK_SIZE); fixed_vector<Chunk> chunks(new_size / Chunk::CHUNK_SIZE);
std::swap(old_nodes, nodes_); old_nodes.swap(nodes_);
chunks_ = std::move(chunks); chunks_ = std::move(chunks);
used_nodes_ = 0; used_nodes_ = 0;

7
tdutils/td/utils/FlatHashMapLinear.h
View File

@ -287,9 +287,8 @@ class FlatHashTable {
return *this; return *this;
} }
void swap(FlatHashTable &other) noexcept { void swap(FlatHashTable &other) noexcept {
using std::swap; nodes_.swap(other.nodes_);
swap(nodes_, other.nodes_); std::swap(used_nodes_, other.used_nodes_);
swap(used_nodes_, other.used_nodes_);
} }
~FlatHashTable() = default; ~FlatHashTable() = default;
@ -496,7 +495,7 @@ class FlatHashTable {
void resize(size_t new_size) { void resize(size_t new_size) {
fixed_vector<Node> old_nodes(new_size); fixed_vector<Node> old_nodes(new_size);
std::swap(old_nodes, nodes_); old_nodes.swap(nodes_);
for (auto &old_node : old_nodes) { for (auto &old_node : old_nodes) {
if (old_node.empty()) { if (old_node.empty()) {

5
tdutils/td/utils/fixed_vector.h
View File

@ -71,4 +71,9 @@ class fixed_vector {
size_t size_{0}; size_t size_{0};
}; };
template <class T>
void swap(fixed_vector<T> &lhs, fixed_vector<T> &rhs) {
lhs.swap(rhs);
}
} // namespace td } // namespace td