Skip to content

util: Fix iterators of BitArray and IntrusiveList #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MonsterDruide1 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

util: Fix iterators of BitArray and IntrusiveList #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0f65c3
util: Fix `BitArray::reverse_iterator`s
MonsterDruide1 Mar 17, 2026
981745a
util: Fix `IntrusiveList`'s iterators
MonsterDruide1 Mar 17, 2026
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
10 changes: 9 additions & 1 deletion include/nn/util/util_BitArray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,14 @@ class BitArray {
};

class iterator {
public:
typedef difference_type difference_type;
typedef reference reference;
typedef pointer pointer;
typedef std::random_access_iterator_tag iterator_category;
typedef value_type value_type;

private:
BitArray* m_pParent;
difference_type m_Pos;

Expand Down Expand Up @@ -69,10 +73,14 @@ class BitArray {
};

class const_iterator {
public:
typedef difference_type difference_type;
typedef const_reference reference;
typedef const_pointer pointer;
typedef std::random_access_iterator_tag iterator_category;
typedef value_type value_type;

private:
const BitArray* m_pParent;
difference_type m_Pos;

Expand Down Expand Up @@ -180,4 +188,4 @@ class BitArray {
RawType* m_pBuf;
size_type m_Len;
};
} // namespace nn::util
} // namespace nn::util
8 changes: 8 additions & 0 deletions include/nn/util/util_IntrusiveList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ class IntrusiveListImplementation {
typedef difference_type difference_type;
typedef value_type* pointer;
typedef value_type& reference;
typedef std::bidirectional_iterator_tag iterator_category;

const_iterator(pointer p) : m_Node(p) {}

Expand All @@ -92,8 +93,10 @@ class IntrusiveListImplementation {
class iterator {
public:
typedef value_type value_type;
typedef difference_type difference_type;
typedef value_type* pointer;
typedef value_type& reference;
typedef std::bidirectional_iterator_tag iterator_category;

iterator(pointer p) : m_Node(p) {}

Expand Down Expand Up @@ -197,12 +200,15 @@ class IntrusiveList {
typedef std::reverse_iterator<iterator> reverse_iterator;
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
typedef int size_type;
typedef int difference_type;

class const_iterator {
public:
typedef T value_type;
typedef difference_type difference_type;
typedef value_type* pointer;
typedef value_type& reference;
typedef std::bidirectional_iterator_tag iterator_category;

reference operator*() const;
pointer operator->() const;
Expand All @@ -228,8 +234,10 @@ class IntrusiveList {
class iterator {
public:
typedef T value_type;
typedef difference_type difference_type;
typedef value_type* pointer;
typedef value_type& reference;
typedef std::bidirectional_iterator_tag iterator_category;

operator const_iterator() const {
return static_cast<detail::IntrusiveListImplementation::const_iterator>(m_Iterator);
Expand Down
Loading