X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=8183fefc6c0b814a0cf96351e3a0d047fded990c;hb=9cee9c1b895be4010deb55623f5c6916320d4401;hp=5863bc9d976caf6a2eb43d392879aa26b74a0a2b;hpb=720f47623827824dc77dd9dff643c06e570d9068;p=pulseview.git diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp index 5863bc9d..8183fefc 100644 --- a/pv/views/trace/view.hpp +++ b/pv/views/trace/view.hpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include @@ -43,7 +42,7 @@ #include "tracetreeitemowner.hpp" using std::list; -using std::unordered_map; +using std::map; using std::set; using std::shared_ptr; using std::vector; @@ -404,14 +403,12 @@ private: TraceTreeItemOwner* find_prevalent_trace_group( const shared_ptr &group, - const unordered_map, - shared_ptr > &signal_map); + const map, shared_ptr > &signal_map); static vector< shared_ptr > extract_new_traces_for_channels( const vector< shared_ptr > &channels, - const unordered_map, - shared_ptr > &signal_map, + const map, shared_ptr > &signal_map, set< shared_ptr > &add_list); void determine_time_unit();