projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the 'default' keyword where applicable. This patch
[pulseview.git]
/
pv
/
data
/
analog.cpp
diff --git
a/pv/data/analog.cpp
b/pv/data/analog.cpp
index 3f96dae1afe566e61d512176d4d1cf2d6fbdd08d..ca2659b175815aa02e05711f4d22b5724bf768bd 100644
(file)
--- a/
pv/data/analog.cpp
+++ b/
pv/data/analog.cpp
@@
-21,7
+21,7
@@
#include <cassert>
#include "analog.hpp"
#include <cassert>
#include "analog.hpp"
-#include "analogs
napsho
t.hpp"
+#include "analogs
egmen
t.hpp"
using std::deque;
using std::max;
using std::deque;
using std::max;
@@
-36,31
+36,31
@@
Analog::Analog() :
{
}
{
}
-void Analog::push_s
napshot(shared_ptr<AnalogSnapshot> &snapsho
t)
+void Analog::push_s
egment(shared_ptr<AnalogSegment> &segmen
t)
{
{
- s
napshots_.push_front(snapsho
t);
+ s
egments_.push_front(segmen
t);
}
}
-const deque< shared_ptr<AnalogS
napshot> >& Analog::analog_snapsho
ts() const
+const deque< shared_ptr<AnalogS
egment> >& Analog::analog_segmen
ts() const
{
{
- return s
napsho
ts_;
+ return s
egmen
ts_;
}
}
-vector< shared_ptr<S
napshot> > Analog::snapsho
ts() const
+vector< shared_ptr<S
egment> > Analog::segmen
ts() const
{
{
- return vector< shared_ptr<S
napsho
t> >(
- s
napshots_.begin(), snapsho
ts_.end());
+ return vector< shared_ptr<S
egmen
t> >(
+ s
egments_.begin(), segmen
ts_.end());
}
void Analog::clear()
{
}
void Analog::clear()
{
- s
napsho
ts_.clear();
+ s
egmen
ts_.clear();
}
}
-uint64_t Analog::
get_
max_sample_count() const
+uint64_t Analog::max_sample_count() const
{
uint64_t l = 0;
{
uint64_t l = 0;
- for (const std::shared_ptr<AnalogS
napshot> s : snapsho
ts_) {
+ for (const std::shared_ptr<AnalogS
egment> s : segmen
ts_) {
assert(s);
l = max(l, s->get_sample_count());
}
assert(s);
l = max(l, s->get_sample_count());
}