X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fsegment.hpp;h=3305f4c8d3033b7ce05f0b06cfcd98cd4549ae82;hb=aca9aa834c742ba70f49d1ac3eb2d1e02e759416;hp=f1ff0f527370a80bbf6137d3291ee53715e6698d;hpb=c70e34649be658e7a443d5e68abe16dd55d53bf2;p=pulseview.git diff --git a/pv/data/segment.hpp b/pv/data/segment.hpp index f1ff0f5..3305f4c 100644 --- a/pv/data/segment.hpp +++ b/pv/data/segment.hpp @@ -23,10 +23,13 @@ #include "pv/util.hpp" -#include #include +#include #include +using std::recursive_mutex; +using std::vector; + namespace SegmentTest { struct SmallSize8Single; struct MediumSize8Single; @@ -37,7 +40,7 @@ struct MaxSize32Single; struct MediumSize32Multi; struct MaxSize32Multi; struct MaxSize32MultiIterated; -} +} // namespace SegmentTest namespace pv { namespace data { @@ -78,8 +81,8 @@ protected: void continue_raw_sample_iteration(SegmentRawDataIterator* it, uint64_t increase); void end_raw_sample_iteration(SegmentRawDataIterator* it); - mutable std::recursive_mutex mutex_; - std::vector data_chunks_; + mutable recursive_mutex mutex_; + vector data_chunks_; uint8_t* current_chunk_; uint64_t used_samples_, unused_samples_; uint64_t sample_count_;