projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move trace view files
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index d3e1f4acd25de681fd147253ddc8d423ce5cd2bc..1e1d600d329d5a010a9231aa047ebfcbef885f9d 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-25,12
+25,12
@@
#include "decoderstack.hpp"
#include "decoderstack.hpp"
+#include <pv/data/decode/annotation.hpp>
+#include <pv/data/decode/decoder.hpp>
#include <pv/data/logic.hpp>
#include <pv/data/logicsegment.hpp>
#include <pv/data/logic.hpp>
#include <pv/data/logicsegment.hpp>
-#include <pv/data/decode/decoder.hpp>
-#include <pv/data/decode/annotation.hpp>
#include <pv/session.hpp>
#include <pv/session.hpp>
-#include <pv/view/logicsignal.hpp>
+#include <pv/view
s/trace
/logicsignal.hpp>
using std::lock_guard;
using std::mutex;
using std::lock_guard;
using std::mutex;
@@
-416,7
+416,7
@@
void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
row_iter = d->rows_.find((*r).second);
else {
// Failing that, use the decoder as a key
row_iter = d->rows_.find((*r).second);
else {
// Failing that, use the decoder as a key
- row_iter = d->rows_.find(Row(decc));
+ row_iter = d->rows_.find(Row(decc));
}
assert(row_iter != d->rows_.end());
}
assert(row_iter != d->rows_.end());