Skip to content

Remove std::iterator inheritance #254

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

Open
chemodansama wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove std::iterator inheritance #254

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
8 changes: 7 additions & 1 deletion entityx/Entity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,14 @@ class EntityManager : entityx::help::NonCopyable {
/// An iterator over a view of the entities in an EntityManager.
/// If All is true it will iterate over all valid entities and will ignore the entity mask.
template <class Delegate, bool All = false>
class ViewIterator : public std::iterator<std::input_iterator_tag, Entity::Id> {
class ViewIterator {
public:
typedef Entity::Id value_type;
typedef ptrdiff_t difference_type;
typedef Entity::Id* pointer;
typedef Entity::Id& reference;
typedef std::input_iterator_tag iterator_category;

Delegate &operator ++() {
++i_;
next();
Expand Down