X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fsegment.hpp;h=7338bd3896f5a055bbe5575b3f06ba514b9cdb90;hb=156f06e95f10587063b97b6b453a603751a0007c;hp=f1ff0f527370a80bbf6137d3291ee53715e6698d;hpb=c70e34649be658e7a443d5e68abe16dd55d53bf2;p=pulseview.git

diff --git a/pv/data/segment.hpp b/pv/data/segment.hpp
index f1ff0f52..7338bd38 100644
--- a/pv/data/segment.hpp
+++ b/pv/data/segment.hpp
@@ -23,10 +23,13 @@
 
 #include "pv/util.hpp"
 
-#include <thread>
 #include <mutex>
+#include <thread>
 #include <vector>
 
+using std::recursive_mutex;
+using std::vector;
+
 namespace SegmentTest {
 struct SmallSize8Single;
 struct MediumSize8Single;
@@ -36,8 +39,9 @@ struct MediumSize32Single;
 struct MaxSize32Single;
 struct MediumSize32Multi;
 struct MaxSize32Multi;
+struct MaxSize32MultiAtOnce;
 struct MaxSize32MultiIterated;
-}
+}  // namespace SegmentTest
 
 namespace pv {
 namespace data {
@@ -78,8 +82,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<uint8_t*> data_chunks_;
+	mutable recursive_mutex mutex_;
+	vector<uint8_t*> data_chunks_;
 	uint8_t* current_chunk_;
 	uint64_t used_samples_, unused_samples_;
 	uint64_t sample_count_;
@@ -98,6 +102,7 @@ protected:
 	friend struct SegmentTest::MaxSize32Single;
 	friend struct SegmentTest::MediumSize32Multi;
 	friend struct SegmentTest::MaxSize32Multi;
+	friend struct SegmentTest::MaxSize32MultiAtOnce;
 	friend struct SegmentTest::MaxSize32MultiIterated;
 };