Chromium Code Reviews| Index: src/unbound-queue-inl.h |
| diff --git a/src/unbound-queue-inl.h b/src/unbound-queue-inl.h |
| index d83c01c7310447e4f532f172fcf3119d662a1479..8ff769afbd26d8038cf2d5898ef68d3ed7df7a9e 100644 |
| --- a/src/unbound-queue-inl.h |
| +++ b/src/unbound-queue-inl.h |
| @@ -7,7 +7,7 @@ |
| #include "src/unbound-queue.h" |
| -#include "src/atomicops.h" |
| +#include "src/base/atomicops.h" |
|
Jakob Kummerow
2014/06/05 11:49:06
You can drop this here if you move it to unbound-q
|
| namespace v8 { |
| namespace internal { |
| @@ -26,7 +26,7 @@ struct UnboundQueue<Record>::Node: public Malloced { |
| template<typename Record> |
| UnboundQueue<Record>::UnboundQueue() { |
| first_ = new Node(Record()); |
| - divider_ = last_ = reinterpret_cast<AtomicWord>(first_); |
| + divider_ = last_ = reinterpret_cast<base::AtomicWord>(first_); |
| } |
| @@ -46,10 +46,10 @@ void UnboundQueue<Record>::DeleteFirst() { |
| template<typename Record> |
| bool UnboundQueue<Record>::Dequeue(Record* rec) { |
| - if (divider_ == Acquire_Load(&last_)) return false; |
| + if (divider_ == base::Acquire_Load(&last_)) return false; |
| Node* next = reinterpret_cast<Node*>(divider_)->next; |
| *rec = next->value; |
| - Release_Store(÷r_, reinterpret_cast<AtomicWord>(next)); |
| + base::Release_Store(÷r_, reinterpret_cast<base::AtomicWord>(next)); |
| return true; |
| } |
| @@ -58,9 +58,9 @@ template<typename Record> |
| void UnboundQueue<Record>::Enqueue(const Record& rec) { |
| Node*& next = reinterpret_cast<Node*>(last_)->next; |
| next = new Node(rec); |
| - Release_Store(&last_, reinterpret_cast<AtomicWord>(next)); |
| + base::Release_Store(&last_, reinterpret_cast<base::AtomicWord>(next)); |
| - while (first_ != reinterpret_cast<Node*>(Acquire_Load(÷r_))) { |
| + while (first_ != reinterpret_cast<Node*>(base::Acquire_Load(÷r_))) { |
| DeleteFirst(); |
| } |
| } |
| @@ -68,13 +68,13 @@ void UnboundQueue<Record>::Enqueue(const Record& rec) { |
| template<typename Record> |
| bool UnboundQueue<Record>::IsEmpty() const { |
| - return NoBarrier_Load(÷r_) == NoBarrier_Load(&last_); |
| + return base::NoBarrier_Load(÷r_) == base::NoBarrier_Load(&last_); |
| } |
| template<typename Record> |
| Record* UnboundQueue<Record>::Peek() const { |
| - if (divider_ == Acquire_Load(&last_)) return NULL; |
| + if (divider_ == base::Acquire_Load(&last_)) return NULL; |
| Node* next = reinterpret_cast<Node*>(divider_)->next; |
| return &next->value; |
| } |