projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #1024 by changing decode channel assigment to PDs
[pulseview.git]
/
pv
/
data
/
decode
/
annotation.cpp
diff --git
a/pv/data/decode/annotation.cpp
b/pv/data/decode/annotation.cpp
index e47f8f03732ca82929ae6489755f4089f3519665..7c720430e9d6cf7e6a688fd6c138cad2cd90589b 100644
(file)
--- a/
pv/data/decode/annotation.cpp
+++ b/
pv/data/decode/annotation.cpp
@@
-26,6
+26,8
@@
extern "C" {
#include "annotation.hpp"
#include "annotation.hpp"
+using std::vector;
+
namespace pv {
namespace data {
namespace decode {
namespace pv {
namespace data {
namespace decode {
@@
-63,7
+65,7
@@
int Annotation::format() const
return format_;
}
return format_;
}
-const
std::
vector<QString>& Annotation::annotations() const
+const vector<QString>& Annotation::annotations() const
{
return annotations_;
}
{
return annotations_;
}