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

Use a sentinel for FlatHashTable::end().

Browse Source
This commit is contained in:
levlam 2022-03-12 13:26:03 +03:00
parent 37123a50ff
commit 62f463b421
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tdutils/td/utils/FlatHashTable.h
View File

@ -45,6 +45,8 @@ class FlatHashTable {
using key_type = typename NodeT::public_key_type; using key_type = typename NodeT::public_key_type;
using value_type = typename NodeT::public_type; using value_type = typename NodeT::public_type;
struct EndSentinel {};
struct Iterator { struct Iterator {
using iterator_category = std::forward_iterator_tag; using iterator_category = std::forward_iterator_tag;
using difference_type = std::ptrdiff_t; using difference_type = std::ptrdiff_t;
@ -82,15 +84,11 @@ class FlatHashTable {
return it_; return it_;
} }
bool operator==(const Iterator &other) const { bool operator==(const EndSentinel &other) const {
DCHECK(begin_ == other.begin_); return it_ == nullptr;
DCHECK(end_ == other.end_);
return it_ == other.it_;
} }
bool operator!=(const Iterator &other) const { bool operator!=(const EndSentinel &other) const {
DCHECK(begin_ == other.begin_); return it_ != nullptr;
DCHECK(end_ == other.end_);
return it_ != other.it_;
} }
Iterator() = default; Iterator() = default;
@ -121,11 +119,11 @@ class FlatHashTable {
pointer operator->() const { pointer operator->() const {
return &*it_; return &*it_;
} }
bool operator==(const ConstIterator &other) const { bool operator==(const EndSentinel &other) const {
return it_ == other.it_; return it_ == other;
} }
bool operator!=(const ConstIterator &other) const { bool operator!=(const EndSentinel &other) const {
return it_ != other.it_; return it_ != other;
} }
ConstIterator() = default; ConstIterator() = default;
@ -226,15 +224,12 @@ class FlatHashTable {
Iterator begin() { Iterator begin() {
return create_iterator(begin_impl()); return create_iterator(begin_impl());
} }
Iterator end() {
return create_iterator(nullptr);
}
ConstIterator begin() const { ConstIterator begin() const {
return ConstIterator(const_cast<FlatHashTable *>(this)->begin()); return ConstIterator(const_cast<FlatHashTable *>(this)->begin());
} }
ConstIterator end() const {
return ConstIterator(const_cast<FlatHashTable *>(this)->end()); EndSentinel end() const {
return EndSentinel();
} }
void reserve(size_t size) { void reserve(size_t size) {
@ -306,7 +301,6 @@ class FlatHashTable {
void erase(Iterator it) { void erase(Iterator it) {
DCHECK(it != end()); DCHECK(it != end());
DCHECK(!it.get()->empty());
erase_node(it.get()); erase_node(it.get());
try_shrink(); try_shrink();
} }