summaryrefslogtreecommitdiff
path: root/gnuradio-core/src/lib/general
diff options
context:
space:
mode:
authorJohnathan Corgan2012-06-22 15:08:04 -0700
committerJohnathan Corgan2012-06-22 15:08:04 -0700
commit6e0626fd93b99eab2234fba79fc0174261ea67f4 (patch)
treeaedd86a26944292a4b08c43201b47db8eb0d6674 /gnuradio-core/src/lib/general
parent2036030273d1c4842670ca3b2bd96e72aa408c9e (diff)
parent82f6a4ee66ce37b67a62af8924b1727e77c68816 (diff)
downloadgnuradio-6e0626fd93b99eab2234fba79fc0174261ea67f4.tar.gz
gnuradio-6e0626fd93b99eab2234fba79fc0174261ea67f4.tar.bz2
gnuradio-6e0626fd93b99eab2234fba79fc0174261ea67f4.zip
Merge branch 'master' into wip/gr-blocks-master
Diffstat (limited to 'gnuradio-core/src/lib/general')
-rw-r--r--gnuradio-core/src/lib/general/gr_annotator_raw.cc2
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 074c09173..e1ae73efb 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.");
}
}