reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2024-12-27 23:25:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

utlvector.h fix assert

Browse Source
This commit is contained in:
s1lentq 2024-01-31 15:10:08 +07:00
parent 4b49f630da
commit 2d957a7915
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
regamedll/public/utlvector.h
View File

@ -43,13 +43,6 @@ public:
CUtlVector(T *pMemory, int numElements); CUtlVector(T *pMemory, int numElements);
~CUtlVector(); ~CUtlVector();
// features C++11 ranged based for
T *begin() { return &m_Memory[0]; }
T *end() { return &m_Memory[m_Size]; }
T const *begin() const { return &m_Memory[0]; }
T const *end() const { return &m_Memory[m_Size]; }
// Copy the array. // Copy the array.
CUtlVector<T> &operator=(const CUtlVector<T> &other); CUtlVector<T> &operator=(const CUtlVector<T> &other);
@ -59,6 +52,13 @@ public:
T &Element(int i); T &Element(int i);
T const &Element(int i) const; T const &Element(int i) const;
// STL compatible member functions. These allow easier use of std::sort
// and they are forward compatible with the C++ 11 range-based for loops
T *begin() { return Base(); }
const T *begin() const { return Base(); }
T *end() { return Base() + Count(); }
const T *end() const { return Base() + Count(); }
// Gets the base address (can change when adding elements!) // Gets the base address (can change when adding elements!)
T *Base(); T *Base();
T const *Base() const; T const *Base() const;
@ -583,13 +583,13 @@ void CUtlVector<T>::SetGrowSize(int size)
template <class T> template <class T>
void CUtlVector<T>::Sort() void CUtlVector<T>::Sort()
{ {
std::sort(Base(), Base() + Count()); std::sort(begin(), end());
} }
template <class T> template <class T>
void CUtlVector<T>::Sort(bool (*pfnLessFunc)(const T &src1, const T &src2)) void CUtlVector<T>::Sort(bool (*pfnLessFunc)(const T &src1, const T &src2))
{ {
std::sort(Base(), Base() + Count(), std::sort(begin(), end(),
[pfnLessFunc](const T &a, const T &b) -> bool [pfnLessFunc](const T &a, const T &b) -> bool
{ {
if (&a == &b) if (&a == &b)
@ -628,5 +628,5 @@ template <class T>
template <class F> template <class F>
void CUtlVector<T>::SortPredicate(F &&predicate) void CUtlVector<T>::SortPredicate(F &&predicate)
{ {
std::sort(Base(), Base() + Count(), predicate); std::sort(begin(), end(), predicate);
} }