aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClyne Sullivan <clyne@bitgloo.com>2022-08-19 20:06:21 -0400
committerClyne Sullivan <clyne@bitgloo.com>2022-08-19 20:06:21 -0400
commitc6ce70f1d5dd12daaf543070584cb3ed96dc3b1e (patch)
tree24f23c47c520f6ee170d389a0c5fcc6e7a0b26e6
parent3989cf4cf81da1077a501a1d53e6114f55b812f9 (diff)
remove deprecated use of std::iterator
-rw-r--r--entityx/Entity.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/entityx/Entity.h b/entityx/Entity.h
index 7c69e0a..3a70839 100644
--- a/entityx/Entity.h
+++ b/entityx/Entity.h
@@ -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 std::iterator<std::input_iterator_tag, Entity::Id>*/ {
public:
+ using iterator_category = std::input_iterator_tag;
+ using value_type = Entity::Id;
+ using difference_type = Entity::Id;
+ using pointer = const Entity::Id*;
+ using reference = const Entity::Id&;
+
Delegate &operator ++() {
++i_;
next();