Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Fixed deprecation warnings for c++20

Browse Source 
(cherry picked from commit ba9bbbc9d0)
This commit is contained in:
Shauren
2023-01-01 00:26:53 +01:00
parent f9033a5dbd
commit b7287e85e4
65 changed files with 757 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/server/shared/DataStores/DBCStorageIterator.h
View File

@@ -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->() 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); }
DBCStorageIterator& operator++()
{
if (_pos < _end)
{
do
++_pos;
while (_pos < _end && !_index[_pos]);
}
T const* operator->() { return _index[_pos]; }
T const* operator*() { return _index[_pos]; }
return *this;
}
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++(int)
{
DBCStorageIterator tmp = *this;
++*this;
return tmp;
}
DBCStorageIterator& operator++()
{
if (_pos < _end)
{
do
++_pos;
while (_pos < _end && !_index[_pos]);
}
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__