Chromium Code Reviews| Index: net/base/priority_queue.h |
| diff --git a/net/base/priority_queue.h b/net/base/priority_queue.h |
| index 9b17d61b21e6ef6c8690b62e2edd9c63cf830e02..bd47f5ca610fea9fd174405e689f56679de0fbe9 100644 |
| --- a/net/base/priority_queue.h |
| +++ b/net/base/priority_queue.h |
| @@ -28,10 +28,10 @@ namespace net { |
| // In debug-mode, the internal queues store (id, value) pairs where id is used |
| // to validate Pointers. |
| // |
| -template<typename T> |
| +template <typename T> |
| class PriorityQueue : public base::NonThreadSafe { |
| private: |
| - // This section is up-front for Pointer only. |
| +// This section is up-front for Pointer only. |
|
Ryan Sleevi
2014/10/11 02:04:47
Seems like this was/is botched too?
jkarlin
2014/10/16 00:19:32
This one is tricky. It indented because the follo
|
| #if !defined(NDEBUG) |
| typedef std::list<std::pair<unsigned, T> > List; |
| #else |
| @@ -57,9 +57,7 @@ class PriorityQueue : public base::NonThreadSafe { |
| iterator_ = dummy_empty_list_.end(); |
| } |
| - Pointer(const Pointer& p) |
| - : priority_(p.priority_), |
| - iterator_(p.iterator_) { |
| + Pointer(const Pointer& p) : priority_(p.priority_), iterator_(p.iterator_) { |
| #if !defined(NDEBUG) |
| id_ = p.id_; |
| #endif |
| @@ -90,9 +88,7 @@ class PriorityQueue : public base::NonThreadSafe { |
| return (priority_ == other.priority_) && (iterator_ == other.iterator_); |
| } |
| - void Reset() { |
| - *this = Pointer(); |
| - } |
| + void Reset() { *this = Pointer(); } |
| private: |
| friend class PriorityQueue; |
| @@ -146,8 +142,8 @@ class PriorityQueue : public base::NonThreadSafe { |
| unsigned id = next_id_; |
| valid_ids_.insert(id); |
| ++next_id_; |
| - return Pointer(priority, list.insert(list.end(), |
| - std::make_pair(id, value))); |
| + return Pointer(priority, |
| + list.insert(list.end(), std::make_pair(id, value))); |
| #else |
| return Pointer(priority, list.insert(list.end(), value)); |
| #endif |
| @@ -164,8 +160,8 @@ class PriorityQueue : public base::NonThreadSafe { |
| unsigned id = next_id_; |
| valid_ids_.insert(id); |
| ++next_id_; |
| - return Pointer(priority, list.insert(list.begin(), |
| - std::make_pair(id, value))); |
| + return Pointer(priority, |
| + list.insert(list.begin(), std::make_pair(id, value))); |
| #else |
| return Pointer(priority, list.insert(list.begin(), value)); |
| #endif |