mirror of
https://github.com/firestar5683/StarPilot.git
synced 2026-07-01 11:32:21 +08:00
cabana: fixed incorrect comparison (#28007)
old-commit-hash: aabbe9ff1835345a67213992d026f02c1e97539e
This commit is contained in:
@@ -124,7 +124,9 @@ void AbstractStream::mergeEvents(std::vector<Event *>::const_iterator first, std
|
||||
parseEvents(new_events, first, last);
|
||||
for (auto &[id, new_e] : new_events) {
|
||||
auto &e = events_[id];
|
||||
auto it = std::upper_bound(e.cbegin(), e.cend(), new_e.front());
|
||||
auto it = std::upper_bound(e.cbegin(), e.cend(), new_e.front(), [](const CanEvent *l, const CanEvent *r) {
|
||||
return l->mono_time < r->mono_time;
|
||||
});
|
||||
e.insert(it, new_e.cbegin(), new_e.cend());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user