Skip to content

StrongIdIterator Operator Overloading #2461

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

Merged
merged 5 commits into from
Dec 2, 2023
Merged

StrongIdIterator Operator Overloading #2461

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9217839
remove friend identifier and define the + and - operator outside of c…
amin1377 Dec 1, 2023
7c1d3dd
remove friend identifier from - operand
amin1377 Dec 1, 2023
ee0a6d6
catch2: change the order of variables in assignment
amin1377 Dec 1, 2023
c0ed005
add const identifier for strong id range operators
amin1377 Dec 1, 2023
a117935
restore the order of test
amin1377 Dec 1, 2023
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
66 changes: 32 additions & 34 deletions libs/libvtrutil/src/vtr_strong_id_range.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,61 +88,59 @@ class StrongIdIterator {
return StrongId(size_t(id_) + offset);
}

///@brief + operator
template<typename IdType>
friend StrongIdIterator<IdType> operator+(
const StrongIdIterator<IdType>& lhs,
ssize_t n) {
StrongIdIterator ret = lhs;
ret += n;
return ret;
}

///@brief - operator
template<typename IdType>
friend StrongIdIterator<IdType> operator-(
const StrongIdIterator<IdType>& lhs,
ssize_t n) {
StrongIdIterator ret = lhs;
ret -= n;
return ret;
}

///@brief ~ operator
template<typename IdType>
friend ssize_t operator-(
const StrongIdIterator<IdType>& lhs,
const StrongIdIterator<IdType>& rhs) {
VTR_ASSERT_SAFE(bool(lhs.id_));
VTR_ASSERT_SAFE(bool(rhs.id_));

ssize_t ret = size_t(lhs.id_);
ret -= size_t(rhs.id_);
ssize_t operator-(const StrongIdIterator<IdType>& other) const {
VTR_ASSERT_SAFE(bool(id_));
VTR_ASSERT_SAFE(bool(other.id_));

ssize_t ret = size_t(id_);
ret -= size_t(other.id_);
return ret;
}

///@brief == operator
template<typename IdType>
friend bool operator==(const StrongIdIterator<IdType>& lhs, const StrongIdIterator<IdType>& rhs) {
return lhs.id_ == rhs.id_;
bool operator==(const StrongIdIterator<IdType>& other) const {
return id_ == other.id_;
}

///@brief != operator
template<typename IdType>
friend bool operator!=(const StrongIdIterator<IdType>& lhs, const StrongIdIterator<IdType>& rhs) {
return lhs.id_ != rhs.id_;
bool operator!=(const StrongIdIterator<IdType>& other) const {
return id_ != other.id_;
}

///@brief < operator
template<typename IdType>
friend bool operator<(const StrongIdIterator<IdType>& lhs, const StrongIdIterator<IdType>& rhs) {
return lhs.id_ < rhs.id_;
bool operator<(const StrongIdIterator<IdType>& other) const {
return id_ < other.id_;
}

private:
StrongId id_;
};

///@brief + operator
template<typename IdType>
inline StrongIdIterator<IdType> operator+(
const StrongIdIterator<IdType>& lhs,
ssize_t n) {
StrongIdIterator ret = lhs;
ret += n;
return ret;
}

///@brief - operator
template<typename IdType>
inline StrongIdIterator<IdType> operator-(
const StrongIdIterator<IdType>& lhs,
ssize_t n) {
StrongIdIterator ret = lhs;
ret -= n;
return ret;
}

/**
* @brief StrongIdRange class
*
Expand Down