BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-27 06:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix reverse iterators for Vector and Array (#6626)

Browse Source 
This commit fixes two serious issues connected with reverse iterators:
1. Vector's rbegin/rend was incompatible with std::reverse_iterator::base();
2. Array's rend() was incorrect, it based on end() instead of begin().
This commit is contained in:
Vladimir Glavnyy
2021-05-10 23:07:56 +07:00
committed by GitHub
parent 4525cd9c56
commit c8c16de167
2 changed files with 84 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/flatbuffers/flatbuffers.h
View File

@@ -172,8 +172,12 @@ template<typename T, typename IT> struct VectorIterator {
return (data_ - other.data_) / IndirectHelper<T>::element_stride;
}
// Note: return type is incompatible with the standard
// `reference operator*()`.
IT operator*() const { return IndirectHelper<T>::Read(data_, 0); }
// Note: return type is incompatible with the standard
// `pointer operator->()`.
IT operator->() const { return IndirectHelper<T>::Read(data_, 0); }
VectorIterator &operator++() {
@@ -227,12 +231,18 @@ struct VectorReverseIterator : public std::reverse_iterator<Iterator> {
explicit VectorReverseIterator(Iterator iter)
: std::reverse_iterator<Iterator>(iter) {}
// Note: return type is incompatible with the standard
// `reference operator*()`.
typename Iterator::value_type operator*() const {
return *(std::reverse_iterator<Iterator>::current);
auto tmp = std::reverse_iterator<Iterator>::current;
return *--tmp;
}
// Note: return type is incompatible with the standard
// `pointer operator->()`.
typename Iterator::value_type operator->() const {
return *(std::reverse_iterator<Iterator>::current);
auto tmp = std::reverse_iterator<Iterator>::current;
return *--tmp;
}
};
@@ -295,14 +305,14 @@ template<typename T> class Vector {
iterator end() { return iterator(Data(), size()); }
const_iterator end() const { return const_iterator(Data(), size()); }
reverse_iterator rbegin() { return reverse_iterator(end() - 1); }
reverse_iterator rbegin() { return reverse_iterator(end()); }
const_reverse_iterator rbegin() const {
return const_reverse_iterator(end() - 1);
return const_reverse_iterator(end());
}
reverse_iterator rend() { return reverse_iterator(begin() - 1); }
reverse_iterator rend() { return reverse_iterator(begin()); }
const_reverse_iterator rend() const {
return const_reverse_iterator(begin() - 1);
return const_reverse_iterator(begin());
}
const_iterator cbegin() const { return begin(); }
@@ -463,7 +473,9 @@ template<typename T, uint16_t length> class Array {
const_reverse_iterator rbegin() const {
return const_reverse_iterator(end());
}
const_reverse_iterator rend() const { return const_reverse_iterator(end()); }
const_reverse_iterator rend() const {
return const_reverse_iterator(begin());
}
const_iterator cbegin() const { return begin(); }
const_iterator cend() const { return end(); }