X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.cpp;h=6350682f95ac2a5ae69e8c11e482fc6212914a67;hp=61382e6f0212a5e2591fe5863bebb2fe3dd87b14;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=c70e34649be658e7a443d5e68abe16dd55d53bf2

diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index 61382e6..6350682 100644
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.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 "logic.hpp"
@@ -35,6 +35,7 @@ using std::max;
 using std::min;
 using std::pair;
 using std::shared_ptr;
+using std::vector;
 
 using sigrok::Logic;
 
@@ -298,7 +299,7 @@ uint64_t LogicSegment::get_unpacked_sample(uint64_t index) const
 }
 
 void LogicSegment::get_subsampled_edges(
-	std::vector<EdgePair> &edges,
+	vector<EdgePair> &edges,
 	uint64_t start, uint64_t end,
 	float min_length, int sig_index)
 {
@@ -322,7 +323,7 @@ void LogicSegment::get_subsampled_edges(
 
 	// Store the initial state
 	last_sample = (get_unpacked_sample(start) & sig_mask) != 0;
-	edges.push_back(pair<int64_t, bool>(index++, last_sample));
+	edges.emplace_back(index++, last_sample);
 
 	while (index + block_length <= end) {
 		//----- Continue to search -----//
@@ -376,7 +377,7 @@ void LogicSegment::get_subsampled_edges(
 
 			// Slide right and zoom out at the beginnings of mip-map
 			// blocks until we encounter a change
-			while (1) {
+			while (true) {
 				const int level_scale_power =
 					(level + 1) * MipMapScalePower;
 				const uint64_t offset =
@@ -408,7 +409,7 @@ void LogicSegment::get_subsampled_edges(
 
 			// Zoom in, and slide right until we encounter a change,
 			// and repeat until we reach min_level
-			while (1) {
+			while (true) {
 				assert(mip_map_[level].data);
 
 				const int level_scale_power =
@@ -458,7 +459,7 @@ void LogicSegment::get_subsampled_edges(
 		// Store the final state
 		const bool final_sample =
 			(get_unpacked_sample(final_index - 1) & sig_mask) != 0;
-		edges.push_back(pair<int64_t, bool>(index, final_sample));
+		edges.emplace_back(index, final_sample);
 
 		index = final_index;
 		last_sample = final_sample;
@@ -467,8 +468,8 @@ void LogicSegment::get_subsampled_edges(
 	// Add the final state
 	const bool end_sample = get_unpacked_sample(end) & sig_mask;
 	if (last_sample != end_sample)
-		edges.push_back(pair<int64_t, bool>(end, end_sample));
-	edges.push_back(pair<int64_t, bool>(end + 1, end_sample));
+		edges.emplace_back(end, end_sample);
+	edges.emplace_back(end + 1, end_sample);
 }
 
 uint64_t LogicSegment::get_subsample(int level, uint64_t offset) const