mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Use default operator<=> to compare Linkgraph Hop. (#13944)

pull/13958/head
Peter Nelson 2025-04-02 23:00:06 +01:00 committed by GitHub
parent 2f36e3e3a1
commit 33a8c1c6fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/linkgraph/refresh.cpp
View File

@ -38,26 +38,6 @@
refresher.RefreshLinks(first, first, v->last_loading_station != StationID::Invalid() ? RefreshFlags{RefreshFlag::HasCargo} : RefreshFlags{});
}
/**
* Comparison operator to allow hops to be used in a std::set.
* @param other Other hop to be compared with.
* @return If this hop is "smaller" than the other (defined by from, to and cargo in this order).
*/
bool LinkRefresher::Hop::operator<(const Hop &other) const
{
if (this->from < other.from) {
return true;
} else if (this->from > other.from) {
return false;
}
if (this->to < other.to) {
return true;
} else if (this->to > other.to) {
return false;
}
return this->cargo < other.cargo;
}
/**
* Constructor for link refreshing algorithm.
* @param vehicle Vehicle to refresh links for.

3
src/linkgraph/refresh.h
View File

@ -73,7 +73,8 @@ protected:
* @param cargo Cargo the consist is probably carrying when passing the hop.
*/
Hop(OrderID from, OrderID to, CargoType cargo) : from(from), to(to), cargo(cargo) {}
bool operator<(const Hop &other) const;
constexpr auto operator<=>(const Hop &) const noexcept = default;
};
typedef std::vector<RefitDesc> RefitList;