projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused "using" declarations.
[pulseview.git]
/
pv
/
data
/
segment.cpp
diff --git
a/pv/data/segment.cpp
b/pv/data/segment.cpp
index 64d9cd66081a414aa1dc5460e64ec4cdc94d868e..ceaf0a056ef84a2c8f473f1d664559b4e583ce1e 100644
(file)
--- a/
pv/data/segment.cpp
+++ b/
pv/data/segment.cpp
@@
-20,15
+20,13
@@
#include "segment.hpp"
#include "segment.hpp"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <vector>
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
using std::lock_guard;
using std::lock_guard;
+using std::min;
using std::recursive_mutex;
using std::recursive_mutex;
-using std::vector;
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-48,8
+46,7
@@
Segment::Segment(uint64_t samplerate, unsigned int unit_size) :
// Determine the number of samples we can fit in one chunk
// without exceeding MaxChunkSize
// Determine the number of samples we can fit in one chunk
// without exceeding MaxChunkSize
- chunk_size_ = std::min(MaxChunkSize,
- (MaxChunkSize / unit_size_) * unit_size_);
+ chunk_size_ = min(MaxChunkSize, (MaxChunkSize / unit_size_) * unit_size_);
// Create the initial chunk
current_chunk_ = new uint8_t[chunk_size_];
// Create the initial chunk
current_chunk_ = new uint8_t[chunk_size_];
@@
-189,7
+186,7
@@
uint8_t* Segment::get_raw_samples(uint64_t start, uint64_t count) const
while (count > 0) {
const uint8_t* chunk = data_chunks_[chunk_num];
while (count > 0) {
const uint8_t* chunk = data_chunks_[chunk_num];
- uint64_t copy_size =
std::
min(count * unit_size_,
+ uint64_t copy_size = min(count * unit_size_,
chunk_size_ - chunk_offs);
memcpy(dest_ptr, chunk + chunk_offs, copy_size);
chunk_size_ - chunk_offs);
memcpy(dest_ptr, chunk + chunk_offs, copy_size);