commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] [gnuradio] 10/22: Formatting fix-ups


From: git
Subject: [Commit-gnuradio] [gnuradio] 10/22: Formatting fix-ups
Date: Wed, 24 Sep 2014 22:07:39 +0000 (UTC)

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit d7007ea03672b9f9ae87c45544394c1e1f4923e4
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++;
     }
   }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]