Skip to content

DPL: do not inherit from std::iterator #8367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 1 commit into from
Mar 17, 2022
Merged

DPL: do not inherit from std::iterator #8367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions Framework/Core/include/Framework/InputRecord.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,18 +493,17 @@ class InputRecord
/// incomplete records to be consumed or processed.
[[nodiscard]] size_t countValidInputs() const;

template <typename T>
using IteratorBase = std::iterator<std::forward_iterator_tag, T>;

template <typename ParentT, typename T>
class Iterator : public IteratorBase<T>
class Iterator
{
public:
using ParentType = ParentT;
using SelfType = Iterator;
using value_type = typename IteratorBase<T>::value_type;
using reference = typename IteratorBase<T>::reference;
using pointer = typename IteratorBase<T>::pointer;
using iterator_category = std::forward_iterator_tag;
using value_type = T;
using reference = T&;
using pointer = T*;
using difference_type = std::ptrdiff_t;
using ElementType = typename std::remove_const<value_type>::type;

Iterator() = delete;
Expand Down
13 changes: 6 additions & 7 deletions Framework/Core/include/Framework/InputSpan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,18 @@ class InputSpan
return get(i).payload;
}

template <typename T>
using IteratorBase = std::iterator<std::forward_iterator_tag, T>;

/// an iterator class working on position within the a parent class
template <typename ParentT, typename T>
class Iterator : public IteratorBase<T>
class Iterator
{
public:
using ParentType = ParentT;
using SelfType = Iterator;
using value_type = typename IteratorBase<T>::value_type;
using reference = typename IteratorBase<T>::reference;
using pointer = typename IteratorBase<T>::pointer;
using iterator_category = std::forward_iterator_tag;
using value_type = T;
using reference = T&;
using pointer = T*;
using difference_type = std::ptrdiff_t;
using ElementType = typename std::remove_const<value_type>::type;

Iterator() = delete;
Expand Down