Merge "Fix cpplint errors for bgp_update_queue.[cc|h]"

Juniper · Dec 23, 2014 · 0b3499d · 0b3499d
2 parents d0a8242 + ad869a5
commit 0b3499d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/src/bgp/bgp_update_queue.cc b/src/bgp/bgp_update_queue.cc
@@ -166,7 +166,8 @@ void UpdateQueue::MoveMarker(UpdateMarker *marker, RouteUpdate *rt_update) {
 
     UpdatesByOrder::iterator iter = queue_.iterator_to(*rt_update);
     if (marker == &tail_marker_) {
-        for (iter++; iter != queue_.end() && iter->IsMarker(); iter++);
+        for (iter++; iter != queue_.end() && iter->IsMarker(); iter++) {
+        }
         queue_.insert(iter, *marker);
     } else {
         queue_.insert(++iter, *marker);
@@ -193,7 +194,7 @@ void UpdateQueue::MarkerSplit(UpdateMarker *marker, const RibPeerSet &msplit) {
     UpdatesByOrder::iterator mpos = queue_.iterator_to(*marker);
     queue_.insert(mpos, *split_marker);
     marker_count_++;
-    
+
     for (size_t i = msplit.find_first();
          i != BitSet::npos; i = msplit.find_next(i)) {
         MarkerMap::iterator loc = markers_.find(i);

diff --git a/src/bgp/bgp_update_queue.h b/src/bgp/bgp_update_queue.h
@@ -2,10 +2,15 @@
  * Copyright (c) 2013 Juniper Networks, Inc. All rights reserved.
  */
 
-#ifndef ctrlplane_bgp_update_queue_h
-#define ctrlplane_bgp_update_queue_h
+#ifndef SRC_BGP_BGP_UPDATE_QUEUE_H_
+#define SRC_BGP_BGP_UPDATE_QUEUE_H_
 
 #include <tbb/mutex.h>
+
+#include <list>
+#include <map>
+#include <set>
+
 #include "bgp/bgp_update.h"
 
 //
@@ -86,31 +91,31 @@ class UpdateQueue {
     > UpdateEntryNode;
 
     typedef boost::intrusive::list<UpdateEntry, UpdateEntryNode> UpdatesByOrder;
-    
+
     // Typedefs for the intrusive set.
     typedef boost::intrusive::member_hook<UpdateInfo,
         boost::intrusive::set_member_hook<>,
         &UpdateInfo::update_node
     > UpdateSetNode;
-    
+
     typedef boost::intrusive::set<UpdateInfo, UpdateSetNode,
         boost::intrusive::compare<UpdateByAttrCmp>
     > UpdatesByAttr;
-    
+
     typedef std::map<int, UpdateMarker *> MarkerMap;
 
     explicit UpdateQueue(int queue_id);
     ~UpdateQueue();
-    
+
     bool Enqueue(RouteUpdate *rt_update);
     void Dequeue(RouteUpdate *rt_update);
-    
+
     RouteUpdate *NextUpdate(UpdateEntry *upentry);
     UpdateEntry *NextEntry(UpdateEntry *upentry);
 
     void AttrDequeue(UpdateInfo *current_uinfo);
     UpdateInfo *AttrNext(UpdateInfo *current_uinfo);
-    
+
     void AddMarker(UpdateMarker *marker, RouteUpdate *rt_update);
     void MoveMarker(UpdateMarker *marker, RouteUpdate *rt_update);
     void MarkerSplit(UpdateMarker *marker, const RibPeerSet &msplit);
@@ -141,7 +146,7 @@ class UpdateQueue {
     MarkerMap markers_;
     UpdateMarker tail_marker_;
 
-    DISALLOW_COPY_AND_ASSIGN(UpdateQueue);    
+    DISALLOW_COPY_AND_ASSIGN(UpdateQueue);
 };
 
-#endif
+#endif  // SRC_BGP_BGP_UPDATE_QUEUE_H_