mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_deprecated_warning' into 'master'

Browse Source 
Remove usage of deprecated std::iterator

See merge request OpenMW/openmw!1589
This commit is contained in:
Evil Eye 2022-01-25 15:32:22 +00:00
commit 783505011c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/openmw/mwworld/containerstore.hpp
View File

@ -258,10 +258,8 @@ namespace MWWorld
friend class MWClass::Container;
};
template<class PtrType>
class ContainerStoreIteratorBase
: public std::iterator<std::forward_iterator_tag, PtrType, std::ptrdiff_t, PtrType *, PtrType&>
{
template<class From, class To, class Dummy>
struct IsConvertible
@ -362,6 +360,12 @@ namespace MWWorld
/// \return reached the end?
public:
using iterator_category = std::forward_iterator_tag;
using value_type = PtrType;
using difference_type = std::ptrdiff_t;
using pointer = PtrType*;
using reference = PtrType&;
template<class T>
ContainerStoreIteratorBase (const ContainerStoreIteratorBase<T>& other)
{