Skip to content
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

Remove deprecated std::iterator #193

Merged
merged 1 commit into from
Jan 31, 2023
Merged

Remove deprecated std::iterator #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

## RcppParallel 5.1.7 (UNRELEASED)

* Remove deprecated `std::iterator`. (#192; @Enchufa2)

## RcppParallel 5.1.6

* Patch for TBB to allow compilation with gcc-13.
Expand Down
37 changes: 21 additions & 16 deletions inst/include/RcppParallel/RMatrix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,21 @@ class RMatrix {
public:

template <typename V>
class row_iterator
: public std::iterator<std::random_access_iterator_tag, V, std::size_t> {
class row_iterator {

public:
inline row_iterator(Row& row, std::size_t i)
using iterator_category = std::random_access_iterator_tag;
using value_type = V;
using difference_type = std::size_t;
using pointer = value_type*;
using reference = value_type&;

inline row_iterator(Row& row, difference_type i)
: start_(row.start_), parentNrow_(row.parent_.nrow()), index_(i)
{
}

inline row_iterator(V* start, std::size_t parentNrow, std::size_t index)
inline row_iterator(pointer start, difference_type parentNrow, difference_type index)
: start_(start), parentNrow_(parentNrow), index_(index)
{
}
Expand Down Expand Up @@ -57,23 +62,23 @@ class RMatrix {
return tmp ;
}

row_iterator operator+(std::size_t n) const {
row_iterator operator+(difference_type n) const {
return row_iterator(start_, parentNrow_ ,index_ + n ) ;
}
row_iterator operator-(std::size_t n) const {
row_iterator operator-(difference_type n) const {
return row_iterator(start_, parentNrow_, index_ - n ) ;
}

std::size_t operator+(const row_iterator& other) const {
difference_type operator+(const row_iterator& other) const {
return index_ + other.index_;
}

std::size_t operator-(const row_iterator& other) const {
difference_type operator-(const row_iterator& other) const {
return index_ - other.index_ ;
}

row_iterator& operator+=(std::size_t n) { index_ += n ; return *this; }
row_iterator& operator-=(std::size_t n) { index_ -= n ; return *this; }
row_iterator& operator+=(difference_type n) { index_ += n ; return *this; }
row_iterator& operator-=(difference_type n) { index_ -= n ; return *this; }

bool operator==(const row_iterator& other) const { return index_ == other.index_; }
bool operator!=(const row_iterator& other) const { return index_ != other.index_; }
Expand All @@ -83,16 +88,16 @@ class RMatrix {
bool operator>=(const row_iterator& other) const { return index_ >= other.index_; }


inline V& operator*() { return start_[index_ * parentNrow_]; }
inline reference operator*() { return start_[index_ * parentNrow_]; }

inline V* operator->() { return &(start_[index_ * parentNrow_]); }
inline pointer operator->() { return &(start_[index_ * parentNrow_]); }

inline V& operator[](int i) { return start_[(index_+i) * parentNrow_]; }
inline reference operator[](int i) { return start_[(index_+i) * parentNrow_]; }

private:
V* start_;
std::size_t parentNrow_;
std::size_t index_;
pointer start_;
difference_type parentNrow_;
difference_type index_;
};

typedef row_iterator<T> iterator;
Expand Down