[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 08/16: Formatting fix-ups
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 08/16: Formatting fix-ups |
Date: |
Fri, 19 Sep 2014 19:07:59 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit b9cd12d71c04fb90e3ae7298353f5b7f5d1a8802
Author: Doug Geiger <address@hidden>
Date: Fri Sep 19 13:31:56 2014 -0400
Formatting fix-ups
---
gnuradio-runtime/lib/buffer.cc | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/gnuradio-runtime/lib/buffer.cc b/gnuradio-runtime/lib/buffer.cc
index f2168f4..dc86b90 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++;
}
}
- [Commit-gnuradio] [gnuradio] branch master updated (01deede -> 6e12074), git, 2014/09/19
- [Commit-gnuradio] [gnuradio] 01/16: pmt: Added float conversion, git, 2014/09/19
- [Commit-gnuradio] [gnuradio] 16/16: Merge remote-tracking branch 'osh/tags_wip', git, 2014/09/19
- [Commit-gnuradio] [gnuradio] 12/16: volk: add feature for json results export, git, 2014/09/19
- [Commit-gnuradio] [gnuradio] 06/16: Fix prune_tags, git, 2014/09/19
- [Commit-gnuradio] [gnuradio] 08/16: Formatting fix-ups,
git <=
- [Commit-gnuradio] [gnuradio] 05/16: Fix(?) prune_tags: needs verification, git, 2014/09/19
- [Commit-gnuradio] [gnuradio] 07/16: runtime: speed up all the things, git, 2014/09/19
- [Commit-gnuradio] [gnuradio] 09/16: Merge remote-tracking branch 'willcode/master', git, 2014/09/19
- [Commit-gnuradio] [gnuradio] 03/16: Fix CMake abuse for assembly (.s) files, git, 2014/09/19
- [Commit-gnuradio] [gnuradio] 15/16: Merge branch 'maint', git, 2014/09/19
- [Commit-gnuradio] [gnuradio] 02/16: Add vector support to abs block. Remove unused num_inputs from xml., git, 2014/09/19
- [Commit-gnuradio] [gnuradio] 11/16: Merge pull request #1 from douggeiger/tags_wip, git, 2014/09/19
- [Commit-gnuradio] [gnuradio] 13/16: Merge remote-tracking branch 'geiger/master', git, 2014/09/19
- [Commit-gnuradio] [gnuradio] 04/16: tags_wip, git, 2014/09/19
- [Commit-gnuradio] [gnuradio] 10/16: blocks: make tagged stream to pdu output optional, git, 2014/09/19