diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-26 15:32:58 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-26 15:32:58 -0700 |
| commit | c5e6d08637be1703af6f5905f21deceed49470a8 (patch) | |
| tree | b4cdf25645874cf3b80c2c90080e8f4269448a32 /gnuradio-runtime | |
| parent | 58486e918fc4c67cd4bb29c0e30a23b8425afd0e (diff) | |
| parent | c0a88bebb5ac163dd774f113b3eef71ed30221ea (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-runtime')
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/tags.h | 12 | ||||
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/gr/tag_utils.py | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/gnuradio-runtime/include/gnuradio/tags.h b/gnuradio-runtime/include/gnuradio/tags.h index 4e63d77755..0551e468d1 100644 --- a/gnuradio-runtime/include/gnuradio/tags.h +++ b/gnuradio-runtime/include/gnuradio/tags.h @@ -60,6 +60,18 @@ namespace gr { return (t.key == key) && (t.value == value) && \ (t.srcid == srcid) && (t.offset == offset); } + + tag_t() + : offset(0), + key(pmt::PMT_NIL), + value(pmt::PMT_NIL), + srcid(pmt::PMT_F) // consistent with default srcid value in block::add_item_tag + { + } + + ~tag_t() + { + } }; } /* namespace gr */ diff --git a/gnuradio-runtime/python/gnuradio/gr/tag_utils.py b/gnuradio-runtime/python/gnuradio/gr/tag_utils.py index ba46e3f4d9..dc36e05250 100644 --- a/gnuradio-runtime/python/gnuradio/gr/tag_utils.py +++ b/gnuradio-runtime/python/gnuradio/gr/tag_utils.py @@ -8,7 +8,7 @@ class PythonTag(object): self.offset = None self.key = None self.value = None - self.srcid = None + self.srcid = False def tag_to_python(tag): """ Convert a stream tag to a Python-readable object """ |