mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #169 from Cuyler36/jgadget_linklist_fixes

Browse Source 
Fixes for JGadget/linklist
This commit is contained in:
Cuyler36
2023-12-04 12:35:18 -05:00
committed by GitHub
parent f3ba41b65a 99be0f51c5
commit 286aef1004
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JGadget/linklist.h
+18 -5
View File
@@ -8,6 +8,10 @@
namespace JGadget {
#define NEGATIVE_OFFSETOF(TYPE, MEMBER) (-static_cast<s32>(offsetof(TYPE, MEMBER)))
#define TLINKLIST_NODE_OFS(TYPE) (NEGATIVE_OFFSETOF(TYPE, mNode))
#define TLinkList(TYPE) TLinkList<TYPE, TLINKLIST_NODE_OFS(TYPE)>
namespace {
template <typename T>
@@ -172,14 +176,22 @@ inline bool operator!=(TNodeLinkList::const_iterator lhs, TNodeLinkList::const_i
/* TODO: TLinkList has not been matched and should be verified */
template <typename T, int O>
class TLinkList;
template <typename T, int O>
bool operator==(typename TLinkList<T, O>::iterator lhs, typename TLinkList<T, O>::iterator rhs);
template <typename T, int O>
class TLinkList : public TNodeLinkList {
public:
class iterator {
public:
iterator(TNodeLinkList::iterator it) : mIt(it) { }
bool operator==(iterator other) { return (mIt == other.mIt); }
bool operator!=(iterator other) { return !(*this == other); }
friend bool operator==(iterator lhs, iterator rhs) { return (lhs.mIt == rhs.mIt); }
friend bool operator!=(iterator lhs, iterator rhs) { return !(lhs == rhs); }
iterator& operator++() {
++mIt;
return *this;
@@ -205,8 +217,9 @@ class TLinkList : public TNodeLinkList {
public:
const_iterator(TNodeLinkList::const_iterator it) : mIt(it) { }
bool operator==(const_iterator other) { return (mIt == other.mIt); }
bool operator!=(const_iterator other) { return !(*this == other); }
friend bool operator== <T, O>(const_iterator lhs, const_iterator rhs) { return (lhs.mIt == rhs.mIt); }
friend bool operator!= <T, O>(const_iterator lhs, const_iterator rhs) { return !(lhs == rhs); }
const_iterator& operator++() {
++mIt;
return *this;
@@ -230,7 +243,7 @@ class TLinkList : public TNodeLinkList {
iterator Find(const T* p) { return TNodeLinkList::Find(TLinkList::Element_toNode(p)); }
iterator Erase( T* p) { return TNodeLinkList::Erase(Element_toNode(p)); }
iterator Insert(iterator it, T* p) { return TNodeLinkList::Insert(it, Element_toNode(p)); }
iterator Insert(iterator it, T* p) { return TNodeLinkList::Insert(it.mIt, Element_toNode(p)); }
void Remove(T* p) { TNodeLinkList::Remove(TLinkList::Element_toNode(p)); }
void Push_front(T* p) { Insert(begin(), p); }
void Push_back(T* p) { Insert(end(), p); }