Skip to content

DPL: fix deprecated inheritance of std::iterator #8381

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 2 commits into from
Mar 21, 2022
Merged

DPL: fix deprecated inheritance of std::iterator #8381

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0848c90
DPL: fix deprecated inheritance of std::iterator
ktf Mar 16, 2022
ff2764c
Use correct tag for iterator.
ktf Mar 18, 2022
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/InputRecordWalker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,20 @@ class InputRecordWalker
InputRecordWalker() = delete;
InputRecordWalker(InputRecord& record, std::vector<InputSpec> filterSpecs = {}) : mRecord(record), mFilterSpecs(filterSpecs) {}

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

/// Iterator implementation
/// Supports the following operations:
/// - increment (there is no decrement, its not a bidirectional parser)
/// - dereference operator returns @a RawDataHeaderInfo as common header
template <typename T>
class Iterator : public IteratorBase<T>
class Iterator
{
public:
using self_type = 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;
// the iterator over the input routes
using input_iterator = decltype(std::declval<InputRecord>().begin());

Expand Down