X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Fviewbase.hpp;h=585dfa0c91ffd6e204c4cfe203e2de5846881834;hb=ff49e70c60ba4ea93c5966dd4d415fcd6f6e19fb;hp=d3111dc79cdfbc5929f260d8f0181a2238f592a9;hpb=74bf66669012692f7eda790abe724bd5bb4ae8c6;p=pulseview.git diff --git a/pv/views/viewbase.hpp b/pv/views/viewbase.hpp index d3111dc7..585dfa0c 100644 --- a/pv/views/viewbase.hpp +++ b/pv/views/viewbase.hpp @@ -38,7 +38,7 @@ #endif using std::shared_ptr; -using std::unordered_set; +using std::vector; namespace pv { @@ -55,7 +55,7 @@ namespace views { enum ViewType { ViewTypeTrace, #ifdef ENABLE_DECODE - ViewTypeDecoderOutput, + ViewTypeDecoderBinary, #endif ViewTypeCount // Indicates how many view types there are, must always be last }; @@ -89,7 +89,7 @@ public: /** * Returns the signal bases contained in this view. */ - unordered_set< shared_ptr > signalbases() const; + vector< shared_ptr > signalbases() const; virtual void clear_signalbases(); @@ -128,9 +128,9 @@ protected: util::TimeUnit time_unit_; - unordered_set< shared_ptr > signalbases_; + vector< shared_ptr > signalbases_; #ifdef ENABLE_DECODE - unordered_set< shared_ptr > decode_signals_; + vector< shared_ptr > decode_signals_; #endif /// The ID of the currently displayed segment