From e72ad82909a8bfa783f2776d7c30200c9c8ead60 Mon Sep 17 00:00:00 2001 From: phosit Date: Wed, 23 Aug 2023 12:31:07 +0000 Subject: [PATCH] Remove the use of std::iterator in EntityMap.h Accepted By: @vladislavbelov Differential Revision: https://code.wildfiregames.com/D5105 This was SVN commit r27813. --- source/simulation2/system/EntityMap.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/source/simulation2/system/EntityMap.h b/source/simulation2/system/EntityMap.h index afb21c915c..5d27d0a031 100644 --- a/source/simulation2/system/EntityMap.h +++ b/source/simulation2/system/EntityMap.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2013 Wildfire Games. +/* Copyright (C) 2023 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -70,8 +70,14 @@ public: } // Iterators - template struct _iter : public std::iterator + template struct _iter { + using iterator_category = std::forward_iterator_tag; + using value_type = U; + using difference_type = std::ptrdiff_t; + using pointer = U*; + using reference = U&; + U* val; inline _iter(U* init) : val(init) {} inline U& operator*() { return *val; }