diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-06-20 12:38:00 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-06-20 12:38:00 -0400 |
| commit | de7257e31c730210732810e1edfce76c77896daa (patch) | |
| tree | ddc318172a04665d0ee2fd53e6632ebd50487a44 /gnuradio-core/src | |
| parent | 4acc9ca36e4c548f2c5bfa4d27f006497b2c7e8a (diff) | |
| parent | a982dbde0fcb5a7a4780f75c4da79370b7272c3e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_annotator_raw.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/general/gr_annotator_raw.cc b/gnuradio-core/src/lib/general/gr_annotator_raw.cc index 074c09173b..e1ae73efb6 100644 --- a/gnuradio-core/src/lib/general/gr_annotator_raw.cc +++ b/gnuradio-core/src/lib/general/gr_annotator_raw.cc @@ -66,7 +66,7 @@ void gr_annotator_raw::add_tag(uint64_t offset, pmt_t key, pmt_t val) std::sort(d_queued_tags.begin(), d_queued_tags.end(), gr_tag_t::offset_compare); // make sure we are not adding an item in the past! - if(tag.offset >= nitems_read(0)) { + if(tag.offset > nitems_read(0)) { throw std::runtime_error("gr_annotator_raw::add_tag: item added too far in the past\n."); } } |