doylet/Dqn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DqnArray bugs

Browse Source
This commit is contained in:
Doyle T 2018-06-26 15:50:47 +10:00
parent 7e507ee470
commit 86d3418315
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dqn.h
View File

@ -170,6 +170,11 @@ using f32 = float;
// Produce a unique name with prefix and counter. i.e. where prefix is "data" then it gives "data1" // Produce a unique name with prefix and counter. i.e. where prefix is "data" then it gives "data1"
#define DQN_UNIQUE_NAME(prefix) DQN_TOKEN_COMBINE2(prefix, __COUNTER__) #define DQN_UNIQUE_NAME(prefix) DQN_TOKEN_COMBINE2(prefix, __COUNTER__)
#define DQN_DEFER_BLOCK(startFunc, ...) startFunc; for (isize i__ = 0; i__ < 1; i__++, __VA_ARGS__)
#define DQN_DEFER(endFunc) for (isize i__ = 0; i__ < 1; i__++, endFunc)
#define DQN_FOR_EACH(i, lim) for (isize (i) = 0; (i) < (isize)(lim); ++(i))
// #Dqn Namespace // #Dqn Namespace
namespace Dqn namespace Dqn
{ {
@ -1179,7 +1184,7 @@ struct DqnArray
}; };
template <typename T> template <typename T>
class DqnSmartArray : public DqnArray<T> struct DqnSmartArray : public DqnArray<T>
{ {
~DqnSmartArray() { if (this->data && this->memAPI) this->memAPI->Free(this->data); } ~DqnSmartArray() { if (this->data && this->memAPI) this->memAPI->Free(this->data); }
}; };
@ -1402,7 +1407,7 @@ void DqnArray<T>::Free()
template <typename T> template <typename T>
bool DqnArray<T>::Reserve(isize newMax) bool DqnArray<T>::Reserve(isize newMax)
{ {
if (newMax <= this->count) if (newMax <= this->max)
{ {
return true; return true;
} }
@ -1450,12 +1455,13 @@ bool DqnArray<T>::Grow(isize multiplier)
template <typename T> template <typename T>
inline bool DqnArray__TryMakeEnoughSpace(DqnArray<T> *array, isize numNewItems) inline bool DqnArray__TryMakeEnoughSpace(DqnArray<T> *array, isize numNewItems)
{ {
bool result = true; i32 numToReserve = numNewItems;
if (!array->data || (array->count + numNewItems) >= array->max) if ((array->count + numNewItems) >= array->max)
{ {
result = array->Grow(); numToReserve = array->count + numNewItems;
} }
bool result = array->Reserve(numNewItems);
return result; return result;
} }