X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.hpp;h=ab109001bd96d72441f5f0bff45a150e9266d861;hb=cf1541a18fcd007c9965a3199b9c4f917856b292;hp=f01aa3ca81c2f71a24c61dc71f7b1d1ba67f7139;hpb=1dcd9b18186741d3ce3164f7e8d6cb13abb578d3;p=pulseview.git diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp index f01aa3ca..ab109001 100644 --- a/pv/data/decode/rowdata.hpp +++ b/pv/data/decode/rowdata.hpp @@ -23,6 +23,7 @@ #include #include +#include #include #include @@ -33,13 +34,15 @@ using std::deque; using std::unordered_map; +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) namespace std { - template<> struct hash { - std::size_t operator()(const QString& s) const noexcept { - return (size_t) qHash(s); - } - }; + template<> struct hash { + std::size_t operator()(const QString& s) const noexcept { + return (size_t) qHash(s); + } + }; } +#endif namespace pv { namespace data { @@ -66,6 +69,8 @@ public: void get_annotation_subset(deque &dest, uint64_t start_sample, uint64_t end_sample) const; + const deque& annotations() const; + const Annotation* emplace_annotation(srd_proto_data *pdata); private: