1 files changed, 39 insertions, 33 deletions
diff --git a/src/server/shared/DataStores/DBCStorageIterator.h b/src/server/shared/DataStores/DBCStorageIterator.h
index 7f27be9b459..d4ac54bc64c 100644
--- a/src/server/shared/DataStores/DBCStorageIterator.h
+++ b/src/server/shared/DataStores/DBCStorageIterator.h
@@ -21,49 +21,55 @@
 #include "Define.h"
 #include <iterator>
 
-template <class T>
-class DBCStorageIterator : public std::iterator<std::forward_iterator_tag, T>
+template<class T>
+class DBCStorageIterator
 {
-    public:
-        DBCStorageIterator() : _index(nullptr), _pos(0), _end(0) { }
-        DBCStorageIterator(T** index, uint32 size, uint32 pos = 0) : _index(index), _pos(pos), _end(size)
+public:
+    using iterator_category = std::forward_iterator_tag;
+    using value_type = T;
+    using difference_type = std::ptrdiff_t;
+    using pointer = T*;
+    using reference = T&;
+
+    DBCStorageIterator() : _index(nullptr), _pos(0), _end(0) { }
+    DBCStorageIterator(T const* const* index, uint32 size, uint32 pos = 0) : _index(index), _pos(pos), _end(size)
+    {
+        if (_pos < _end)
         {
-            if (_pos < _end)
-            {
-                while (_pos < _end && !_index[_pos])
-                    ++_pos;
-            }
+            while (_pos < _end && !_index[_pos])
+                ++_pos;
         }
+    }
 
-        T const* operator->() { return _index[_pos]; }
-        T const* operator*() { return _index[_pos]; }
+    T const* operator->() const { return _index[_pos]; }
+    T const* operator*() const { return _index[_pos]; }
 
-        bool operator==(DBCStorageIterator const& right) const { /*ASSERT(_index == right._index, "Iterator belongs to a different container")*/ return _pos == right._pos; }
-        bool operator!=(DBCStorageIterator const& right) const { return !(*this == right); }
+    bool operator==(DBCStorageIterator const& right) const { /*ASSERT(_index == right._index, "Iterator belongs to a different container")*/ return _pos == right._pos; }
+    bool operator!=(DBCStorageIterator const& right) const { return !(*this == right); }
 
-        DBCStorageIterator& operator++()
+    DBCStorageIterator& operator++()
+    {
+        if (_pos < _end)
         {
-            if (_pos < _end)
-            {
-                do
-                    ++_pos;
-                while (_pos < _end && !_index[_pos]);
-            }
-
-            return *this;
+            do
+                ++_pos;
+            while (_pos < _end && !_index[_pos]);
         }
 
-        DBCStorageIterator operator++(int)
-        {
-            DBCStorageIterator tmp = *this;
-            ++*this;
-            return tmp;
-        }
+        return *this;
+    }
+
+    DBCStorageIterator operator++(int)
+    {
+        DBCStorageIterator tmp = *this;
+        ++*this;
+        return tmp;
+    }
 
-    private:
-        T** _index;
-        uint32 _pos;
-        uint32 _end;
+private:
+    T const* const* _index;
+    uint32 _pos;
+    uint32 _end;
 };
 
 #endif // DBCStorageIterator_h__