projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: Make sure we don't try to add a non-existant decoder
[pulseview.git]
/
pv
/
data
/
decode
/
decoder.cpp
diff --git
a/pv/data/decode/decoder.cpp
b/pv/data/decode/decoder.cpp
index 5fae925886155a900394cb64d6861e6e3fb37b82..d3ee3459255ebc1ff3246fcda2d6a61b53859e56 100644
(file)
--- a/
pv/data/decode/decoder.cpp
+++ b/
pv/data/decode/decoder.cpp
@@
-68,13
+68,13
@@
Decoder::channels() const
return channels_;
}
return channels_;
}
-void Decoder::set_channels(
std::
map<const srd_channel*,
- s
td::s
hared_ptr<data::SignalBase> > channels)
+void Decoder::set_channels(map<const srd_channel*,
+ shared_ptr<data::SignalBase> > channels)
{
channels_ = channels;
}
{
channels_ = channels;
}
-const
std::map<std::
string, GVariant*>& Decoder::options() const
+const
map<
string, GVariant*>& Decoder::options() const
{
return options_;
}
{
return options_;
}