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

[C++] Remove std::iterator usage (#4340) (#4341)

Browse Source 
* [C++] Remove std::iterator usage (#4340)

Inheriting from std::iterator has never been required, and it's
deprecated in C++17. It can be replaced by directly providing typedefs.

Include <iterator> for std::random_access_iterator_tag.

Note that structs default to public access control.

* [C++] Change whitespace style in typedefs.
This commit is contained in:
Stephan T. Lavavej
2017-06-07 16:26:06 -07:00
committed by Wouter van Oortmerssen
parent da67c0a71f
commit 86b505e412
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/flatbuffers/base.h
View File

@@ -19,6 +19,7 @@
#include <vector>
#include <set>
#include <algorithm>
#include <iterator>
#include <memory>
#ifdef _STLPORT_VERSION

15
include/flatbuffers/flatbuffers.h
View File

@@ -118,12 +118,13 @@ template<typename T> struct IndirectHelper<const T *> {
// An STL compatible iterator implementation for Vector below, effectively
// calling Get() for every element.
template<typename T, typename IT>
struct VectorIterator
: public std::iterator<std::random_access_iterator_tag, IT, uoffset_t> {
struct VectorIterator {
typedef std::random_access_iterator_tag iterator_category;
typedef IT value_type;
typedef uoffset_t difference_type;
typedef IT *pointer;
typedef IT &reference;
typedef std::iterator<std::random_access_iterator_tag, IT, uoffset_t> super_type;
public:
VectorIterator(const uint8_t *data, uoffset_t i) :
data_(data + IndirectHelper<T>::element_stride * i) {}
VectorIterator(const VectorIterator &other) : data_(other.data_) {}
@@ -154,11 +155,11 @@ public:
return (data_ - other.data_) / IndirectHelper<T>::element_stride;
}
typename super_type::value_type operator *() const {
IT operator *() const {
return IndirectHelper<T>::Read(data_, 0);
}
typename super_type::value_type operator->() const {
IT operator->() const {
return IndirectHelper<T>::Read(data_, 0);
}