projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use std:: in the code directly (where possible).
[pulseview.git]
/
pv
/
data
/
analogsegment.cpp
diff --git
a/pv/data/analogsegment.cpp
b/pv/data/analogsegment.cpp
index 7458a074fff8c229650a16279fa785945faef067..6719340c5e9e06eb58698de193c3dfd7927d238c 100644
(file)
--- a/
pv/data/analogsegment.cpp
+++ b/
pv/data/analogsegment.cpp
@@
-31,10
+31,12
@@
using std::lock_guard;
using std::recursive_mutex;
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::max;
using std::max_element;
using std::min;
using std::min_element;
+using std::pair;
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-101,9
+103,9
@@
const float* AnalogSegment::get_samples(
return (float*)get_raw_samples(start_sample, (end_sample - start_sample));
}
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)
}
SegmentAnalogDataIterator* AnalogSegment::begin_sample_iteration(uint64_t start)