X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsegment.cpp;h=86211f8218f52d02eb8ed59df0e2eecf998379a9;hp=64d9cd66081a414aa1dc5460e64ec4cdc94d868e;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=c70e34649be658e7a443d5e68abe16dd55d53bf2

diff --git a/pv/data/segment.cpp b/pv/data/segment.cpp
index 64d9cd6..86211f8 100644
--- a/pv/data/segment.cpp
+++ b/pv/data/segment.cpp
@@ -20,13 +20,13 @@
 
 #include "segment.hpp"
 
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
 #include <vector>
 
 using std::lock_guard;
+using std::min;
 using std::recursive_mutex;
 using std::vector;
 
@@ -48,8 +48,7 @@ Segment::Segment(uint64_t samplerate, unsigned int unit_size) :
 
 	// Determine the number of samples we can fit in one chunk
 	// without exceeding MaxChunkSize
-	chunk_size_ = std::min(MaxChunkSize,
-		(MaxChunkSize / unit_size_) * unit_size_);
+	chunk_size_ = min(MaxChunkSize, (MaxChunkSize / unit_size_) * unit_size_);
 
 	// Create the initial chunk
 	current_chunk_ = new uint8_t[chunk_size_];
@@ -189,7 +188,7 @@ uint8_t* Segment::get_raw_samples(uint64_t start, uint64_t count) const
 	while (count > 0) {
 		const uint8_t* chunk = data_chunks_[chunk_num];
 
-		uint64_t copy_size = std::min(count * unit_size_,
+		uint64_t copy_size = min(count * unit_size_,
 			chunk_size_ - chunk_offs);
 
 		memcpy(dest_ptr, chunk + chunk_offs, copy_size);