X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fanalogsegment.cpp;h=6719340c5e9e06eb58698de193c3dfd7927d238c;hb=04e1acc23e835018c3c13d8f29115cb285035151;hp=b3f310a144c5cd7ce2e18fb83ed242bd10526b6c;hpb=c70e34649be658e7a443d5e68abe16dd55d53bf2;p=pulseview.git

diff --git a/pv/data/analogsegment.cpp b/pv/data/analogsegment.cpp
index b3f310a..6719340 100644
--- a/pv/data/analogsegment.cpp
+++ b/pv/data/analogsegment.cpp
@@ -19,9 +19,9 @@
 
 #include <extdef.h>
 
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cassert>
+#include <cstring>
+#include <cstdlib>
 #include <cmath>
 
 #include <algorithm>
@@ -31,10 +31,12 @@
 
 using std::lock_guard;
 using std::recursive_mutex;
+using std::make_pair;
 using std::max;
 using std::max_element;
 using std::min;
 using std::min_element;
+using std::pair;
 
 namespace pv {
 namespace data {
@@ -101,9 +103,9 @@ const float* AnalogSegment::get_samples(
 	return (float*)get_raw_samples(start_sample, (end_sample - start_sample));
 }
 
-const std::pair<float, float> AnalogSegment::get_min_max() const
+const pair<float, float> AnalogSegment::get_min_max() const
 {
-	return std::make_pair(min_value_, max_value_);
+	return make_pair(min_value_, max_value_);
 }
 
 SegmentAnalogDataIterator* AnalogSegment::begin_sample_iteration(uint64_t start)