diff options
| author | Doug Geiger <doug.geiger@bioradiation.net> | 2014-09-19 13:31:56 -0400 |
|---|---|---|
| committer | Doug Geiger <doug.geiger@bioradiation.net> | 2014-09-19 13:31:56 -0400 |
| commit | b9cd12d71c04fb90e3ae7298353f5b7f5d1a8802 (patch) | |
| tree | 6c22fdb3b2693d4621f5aa926703136a511b5154 /gnuradio-runtime/lib/buffer.cc | |
| parent | 72e3da15f40e9fff5297f5134676063397035423 (diff) | |
Formatting fix-ups
Diffstat (limited to 'gnuradio-runtime/lib/buffer.cc')
| -rw-r--r-- | gnuradio-runtime/lib/buffer.cc | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/gnuradio-runtime/lib/buffer.cc b/gnuradio-runtime/lib/buffer.cc index f2168f4a9c..dc86b90aba 100644 --- a/gnuradio-runtime/lib/buffer.cc +++ b/gnuradio-runtime/lib/buffer.cc @@ -234,7 +234,7 @@ namespace gr { gr::thread::scoped_lock guard(*mutex()); for(std::multimap<uint64_t,tag_t>::iterator it = d_item_tags.lower_bound(tag.offset); it != d_item_tags.upper_bound(tag.offset); ++it) { if((*it).second == tag) { - (*it).second.marked_deleted.push_back(id); + (*it).second.marked_deleted.push_back(id); } } } @@ -320,7 +320,7 @@ namespace gr { buffer_reader::get_tags_in_range(std::vector<tag_t> &v, uint64_t abs_start, uint64_t abs_end, - long id) + long id) { gr::thread::scoped_lock guard(*mutex()); @@ -331,21 +331,17 @@ namespace gr { uint64_t item_time; while(itr != itr_end) { item_time = (*itr).second.offset + d_attr_delay; - //item_time = (*itr).offset + d_attr_delay; - if((item_time >= abs_start) && (item_time < abs_end)) { - std::vector<long>::iterator id_itr; - id_itr = std::find(itr->second.marked_deleted.begin(), itr->second.marked_deleted.end(), id); - + std::vector<long>::iterator id_itr; + id_itr = std::find(itr->second.marked_deleted.begin(), itr->second.marked_deleted.end(), id); // If id is not in the vector of marked blocks - if(id_itr == itr->second.marked_deleted.end()) { + if(id_itr == itr->second.marked_deleted.end()) { tag_t t = (*itr).second; t.offset += d_attr_delay; - v.push_back(t); - v.back().marked_deleted.clear(); - } + v.push_back(t); + v.back().marked_deleted.clear(); + } } - itr++; } } |