From fd25b33d6f5eba869b706719ba05cf5e7374e329 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 4 Dec 2023 18:30:02 -0800 Subject: [PATCH] build fix --- include/JSystem/JGadget/linklist.h | 2 +- src/JSystem/JGadget/linklist.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h index 7c8857fc3..c07d49b69 100644 --- a/include/JSystem/JGadget/linklist.h +++ b/include/JSystem/JGadget/linklist.h @@ -84,7 +84,7 @@ struct TNodeLinkList { template void Remove_if(Predicate predicate, TNodeLinkList& tList) { iterator it = begin(); - while (!Iterator_isEnd_(it)) { + while (!Iterator_isEnd_(const_iterator(it))) { if (predicate(*it)) { iterator itPrev = it; ++it; diff --git a/src/JSystem/JGadget/linklist.cpp b/src/JSystem/JGadget/linklist.cpp index 956bd4637..702226316 100644 --- a/src/JSystem/JGadget/linklist.cpp +++ b/src/JSystem/JGadget/linklist.cpp @@ -83,7 +83,7 @@ JGadget::TNodeLinkList::iterator JGadget::TNodeLinkList::Insert(iterator it, TLi pIt->mPrev = p; pItPrev->mNext = p; count++; - return p; + return iterator(p); } /* 802BFE20-802BFE44 .text Erase__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode */ @@ -93,7 +93,7 @@ JGadget::TNodeLinkList::iterator JGadget::TNodeLinkList::Erase(TLinkListNode* p) pNext->mPrev = pPrev; pPrev->mNext = pNext; count--; - return pNext; + return iterator(pNext); } /* 802BFE44-802BFF14 .text Remove__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode */