Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions include/container/seadPtrArray.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,17 @@ class PtrArrayImpl
void* front() const { return mPtrs[0]; }
void* back() const { return mPtrs[mPtrNum - 1]; }

void pushBack(void* ptr)
bool pushBack(void* ptr)
{
if (isFull())
{
SEAD_ASSERT_MSG(false, "list is full.");
return;
return false;
}
// Simplest insert case, so this is implemented directly without using insert().
mPtrs[mPtrNum] = ptr;
++mPtrNum;
return true;
}

void pushFront(void* ptr) { insert(0, ptr); }
Expand Down Expand Up @@ -235,7 +236,7 @@ class PtrArray : public PtrArrayImpl
T* front() const { return at(0); }
T* back() const { return at(mPtrNum - 1); }

void pushBack(T* ptr) { PtrArrayImpl::pushBack(constCast(ptr)); }
bool pushBack(T* ptr) { return PtrArrayImpl::pushBack(constCast(ptr)); }
void pushFront(T* ptr) { PtrArrayImpl::pushFront(constCast(ptr)); }

T* popBack() { return static_cast<T*>(PtrArrayImpl::popBack()); }
Expand Down