#include <extdef.h>
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cassert>
+#include <cstring>
+#include <cstdlib>
#include <cmath>
#include <algorithm>
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 {
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) const
+SegmentAnalogDataIterator* AnalogSegment::begin_sample_iteration(uint64_t start)
{
return (SegmentAnalogDataIterator*)begin_raw_sample_iteration(start);
}
-void AnalogSegment::continue_sample_iteration(SegmentAnalogDataIterator* it, uint64_t increase) const
+void AnalogSegment::continue_sample_iteration(SegmentAnalogDataIterator* it, uint64_t increase)
{
Segment::continue_raw_sample_iteration((SegmentRawDataIterator*)it, increase);
}
-void AnalogSegment::end_sample_iteration(SegmentAnalogDataIterator* it) const
+void AnalogSegment::end_sample_iteration(SegmentAnalogDataIterator* it)
{
Segment::end_raw_sample_iteration((SegmentRawDataIterator*)it);
}