Merge integration refs/builds/qtci/dev/1617091379

This commit is contained in:
Qt CI Bot 2021-03-30 10:52:16 +00:00
commit 32fd331bce

View File

@ -132,11 +132,11 @@ public:
class iterator { class iterator {
T *i = nullptr; T *i = nullptr;
public: public:
typedef std::random_access_iterator_tag iterator_category; using iterator_category = std::random_access_iterator_tag;
typedef qsizetype difference_type; using difference_type = qsizetype;
typedef T value_type; using value_type = T;
typedef T *pointer; using pointer = T *;
typedef T &reference; using reference = T &;
inline constexpr iterator() = default; inline constexpr iterator() = default;
inline iterator(T *n) : i(n) {} inline iterator(T *n) : i(n) {}
@ -167,11 +167,11 @@ public:
class const_iterator { class const_iterator {
const T *i = nullptr; const T *i = nullptr;
public: public:
typedef std::random_access_iterator_tag iterator_category; using iterator_category = std::random_access_iterator_tag;
typedef qsizetype difference_type; using difference_type = qsizetype;
typedef T value_type; using value_type = T;
typedef const T *pointer; using pointer = const T *;
typedef const T &reference; using reference = const T &;
inline constexpr const_iterator() = default; inline constexpr const_iterator() = default;
inline const_iterator(const T *n) : i(n) {} inline const_iterator(const T *n) : i(n) {}