From b07058407be92b4abcfd9059bc2585f52c46f93d Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 24 Apr 2023 09:20:43 +0800 Subject: [PATCH] cabana: fixed incorrect comparison (#28007) old-commit-hash: aabbe9ff1835345a67213992d026f02c1e97539e --- tools/cabana/streams/abstractstream.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/cabana/streams/abstractstream.cc b/tools/cabana/streams/abstractstream.cc index 96616d0de6..88c56dce43 100644 --- a/tools/cabana/streams/abstractstream.cc +++ b/tools/cabana/streams/abstractstream.cc @@ -124,7 +124,9 @@ void AbstractStream::mergeEvents(std::vector::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()); } }