Skip to content
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.

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

Do not use std::iterator that is deprecated in c++17 #11941

Merged
merged 1 commit into from
Sep 14, 2021
Merged
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion libevmasm/BlockDeduplicator.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,14 @@ class BlockDeduplicator
/// Iterator that skips tags and skips to the end if (all branches of) the control
/// flow does not continue to the next instruction.
/// If the arguments are supplied to the constructor, replaces items on the fly.
struct BlockIterator: std::iterator<std::forward_iterator_tag, AssemblyItem const>
struct BlockIterator
{
public:
using iterator_category = std::forward_iterator_tag;
using value_type = AssemblyItem const;
using difference_type = std::ptrdiff_t;
using pointer = AssemblyItem const*;
using reference = AssemblyItem const&;
BlockIterator(
AssemblyItems::const_iterator _it,
AssemblyItems::const_iterator _end,
Expand Down