X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsnapshot.h;h=48879991fbbcc7d4af1d197ea68accba72512699;hp=1f1ca3cf0b8539e7387c5211434123ce98ee42f4;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hpb=27d7c96b57d967edd8bcde9bb5570d573a0ef474 diff --git a/pv/data/snapshot.h b/pv/data/snapshot.h index 1f1ca3cf..48879991 100644 --- a/pv/data/snapshot.h +++ b/pv/data/snapshot.h @@ -21,9 +21,9 @@ #ifndef PULSEVIEW_PV_DATA_SNAPSHOT_H #define PULSEVIEW_PV_DATA_SNAPSHOT_H -#include - -#include +#include +#include +#include namespace pv { namespace data { @@ -31,13 +31,13 @@ namespace data { class Snapshot { public: - Snapshot(int unit_size); + Snapshot(unsigned int unit_size); virtual ~Snapshot(); uint64_t get_sample_count() const; - int unit_size() const; + unsigned int unit_size() const; /** * @brief Increase the capacity of the snapshot. @@ -70,11 +70,11 @@ protected: void append_data(void *data, uint64_t samples); protected: - mutable boost::recursive_mutex _mutex; - void *_data; + mutable std::recursive_mutex _mutex; + std::vector _data; uint64_t _sample_count; uint64_t _capacity; - int _unit_size; + unsigned int _unit_size; }; } // namespace data