Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

AyStar: Use dbg_assert in BinaryHeap Push, GetElement

Browse Source
This commit is contained in:
Jonathan G Rennison 2023-02-26 10:45:56 +00:00
parent ad90f90d43
commit dd1bd270e7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pathfinder/npf/queue.cpp
View File

@ -84,11 +84,11 @@ void BinaryHeap::Free(bool free_values)
bool BinaryHeap::Push(void *item, int priority) bool BinaryHeap::Push(void *item, int priority)
{ {
if (this->size == this->max_size) return false; if (this->size == this->max_size) return false;
assert(this->size < this->max_size); dbg_assert(this->size < this->max_size);
if (this->elements[this->size >> BINARY_HEAP_BLOCKSIZE_BITS] == nullptr) { if (this->elements[this->size >> BINARY_HEAP_BLOCKSIZE_BITS] == nullptr) {
/* The currently allocated blocks are full, allocate a new one */ /* The currently allocated blocks are full, allocate a new one */
assert((this->size & BINARY_HEAP_BLOCKSIZE_MASK) == 0); dbg_assert((this->size & BINARY_HEAP_BLOCKSIZE_MASK) == 0);
this->elements[this->size >> BINARY_HEAP_BLOCKSIZE_BITS] = MallocT<BinaryHeapNode>(BINARY_HEAP_BLOCKSIZE); this->elements[this->size >> BINARY_HEAP_BLOCKSIZE_BITS] = MallocT<BinaryHeapNode>(BINARY_HEAP_BLOCKSIZE);
this->blocks++; this->blocks++;
} }

2
src/pathfinder/npf/queue.h
View File

@ -43,7 +43,7 @@ struct BinaryHeap {
*/ */
inline BinaryHeapNode &GetElement(uint i) inline BinaryHeapNode &GetElement(uint i)
{ {
assert(i > 0); dbg_assert(i > 0);
return this->elements[(i - 1) >> BINARY_HEAP_BLOCKSIZE_BITS][(i - 1) & BINARY_HEAP_BLOCKSIZE_MASK]; return this->elements[(i - 1) >> BINARY_HEAP_BLOCKSIZE_BITS][(i - 1) & BINARY_HEAP_BLOCKSIZE_MASK];
} }