#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/decode/decoder.hpp>
-#include <pv/data/decode/annotation.hpp>
#include <pv/session.hpp>
#include <pv/view/logicsignal.hpp>
using std::max;
using std::min;
using std::list;
-using std::map;
-using std::pair;
using std::shared_ptr;
using std::make_shared;
using std::vector;
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());
if (row_iter == d->rows_.end()) {
qDebug() << "Unexpected annotation: decoder = " << decc <<
", format = " << a.format();
- assert(0);
+ assert(false);
return;
}