X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.cpp;h=d43f89a9c596551ba8e06a6d6710075582993565;hb=69e33a1b71599bbe35176ef7a77b58793a7d6ca2;hp=2b9d89bf4398b5ae4c74f72b59fc890be2e34145;hpb=f3d66e52ed6b454ea7a0662d5e6367e230116a2b;p=pulseview.git

diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index 2b9d89bf..d43f89a9 100644
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -23,11 +23,11 @@
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
-#include <math.h>
+#include <cmath>
 
 #include "logicsegment.hpp"
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::lock_guard;
 using std::recursive_mutex;
@@ -47,7 +47,7 @@ const float LogicSegment::LogMipMapScaleFactor = logf(MipMapScaleFactor);
 const uint64_t LogicSegment::MipMapDataUnit = 64*1024;	// bytes
 
 LogicSegment::LogicSegment(shared_ptr<Logic> logic, uint64_t samplerate,
-                             const uint64_t expected_num_samples) :
+				const uint64_t expected_num_samples) :
 	Segment(samplerate, logic->unit_size()),
 	last_append_sample_(0)
 {
@@ -306,7 +306,7 @@ void LogicSegment::get_subsampled_edges(
 
 		// We cannot fast-forward if there is no mip-map data at
 		// at the minimum level.
-		fast_forward = (mip_map_[level].data != NULL);
+		fast_forward = (mip_map_[level].data != nullptr);
 
 		if (min_length < MipMapScaleFactor)
 		{