mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
CUtlRBTree int64 promotion
Promote parameter types to int64 as CUtlMemory has been modified to use int64 for size types.
This commit is contained in:
parent
31a9d1cb25
commit
6e1f15933f
@ -140,11 +140,11 @@ public:
|
||||
// Left at growSize = 0, the memory will first allocate 1 element and double in size
|
||||
// at each increment.
|
||||
// LessFunc_t is required, but may be set after the constructor using SetLessFunc() below
|
||||
CUtlRBTree(int growSize = 0, int initSize = 0, const LessFunc_t& lessfunc = 0);
|
||||
CUtlRBTree(int64 growSize = 0, int64 initSize = 0, const LessFunc_t& lessfunc = 0);
|
||||
CUtlRBTree(const LessFunc_t& lessfunc);
|
||||
~CUtlRBTree();
|
||||
|
||||
void EnsureCapacity(int num);
|
||||
void EnsureCapacity(int64 num);
|
||||
|
||||
// NOTE: CopyFrom is fast but dangerous! It just memcpy's all nodes - it does NOT run copy constructors, so
|
||||
// it is not a true deep copy (i.e 'T' must be POD for this to work - e.g CUtlString will not work).
|
||||
@ -204,7 +204,7 @@ public:
|
||||
// NOTE: the returned 'index' will be valid as long as the element remains in the tree
|
||||
// (other elements being added/removed will not affect it)
|
||||
I Insert(T const& insert);
|
||||
void Insert(const T* pArray, int nItems);
|
||||
void Insert(const T* pArray, int64 nItems);
|
||||
I InsertIfNotFound(T const& insert);
|
||||
|
||||
// Find method
|
||||
@ -372,7 +372,7 @@ protected:
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
template < class T, class I, typename L, class M >
|
||||
inline CUtlRBTree<T, I, L, M>::CUtlRBTree(int growSize, int initSize, const LessFunc_t& lessfunc) :
|
||||
inline CUtlRBTree<T, I, L, M>::CUtlRBTree(int64 growSize, int64 initSize, const LessFunc_t& lessfunc) :
|
||||
m_LessFunc(lessfunc),
|
||||
m_Elements(growSize, initSize),
|
||||
m_Root(InvalidIndex()),
|
||||
@ -402,7 +402,7 @@ inline CUtlRBTree<T, I, L, M>::~CUtlRBTree()
|
||||
}
|
||||
|
||||
template < class T, class I, typename L, class M >
|
||||
inline void CUtlRBTree<T, I, L, M>::EnsureCapacity(int num)
|
||||
inline void CUtlRBTree<T, I, L, M>::EnsureCapacity(int64 num)
|
||||
{
|
||||
m_Elements.EnsureCapacity(num);
|
||||
}
|
||||
@ -1497,7 +1497,7 @@ I CUtlRBTree<T, I, L, M>::Insert(T const& insert)
|
||||
|
||||
|
||||
template < class T, class I, typename L, class M >
|
||||
void CUtlRBTree<T, I, L, M>::Insert(const T* pArray, int nItems)
|
||||
void CUtlRBTree<T, I, L, M>::Insert(const T* pArray, int64 nItems)
|
||||
{
|
||||
while (nItems--)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user