Chromium Code Reviews| Index: src/zone/zone-allocator.h |
| diff --git a/src/zone-allocator.h b/src/zone/zone-allocator.h |
| similarity index 68% |
| rename from src/zone-allocator.h |
| rename to src/zone/zone-allocator.h |
| index f46151ebc3db0ee40a97c6264bfd742e2189901c..8d2faeb33d13c93fc2ba321ad16f7bf150ddca36 100644 |
| --- a/src/zone-allocator.h |
| +++ b/src/zone/zone-allocator.h |
| @@ -2,17 +2,17 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef V8_ZONE_ALLOCATOR_H_ |
| -#define V8_ZONE_ALLOCATOR_H_ |
| +#ifndef V8_SRC_ZONE_ZONE_ALLOCATOR_H_ |
|
marja
2016/09/19 08:05:11
Ditto
heimbuef
2016/09/19 10:47:51
Done.
|
| +#define V8_SRC_ZONE_ZONE_ALLOCATOR_H_ |
| #include <limits> |
| -#include "src/zone.h" |
| +#include "src/zone/zone.h" |
| namespace v8 { |
| namespace internal { |
| -template<typename T> |
| +template <typename T> |
| class zone_allocator { |
| public: |
| typedef T* pointer; |
| @@ -22,31 +22,34 @@ class zone_allocator { |
| typedef T value_type; |
| typedef size_t size_type; |
| typedef ptrdiff_t difference_type; |
| - template<class O> struct rebind { |
| + template <class O> |
| + struct rebind { |
| typedef zone_allocator<O> other; |
| }; |
| explicit zone_allocator(Zone* zone) throw() : zone_(zone) {} |
| explicit zone_allocator(const zone_allocator& other) throw() |
| : zone_(other.zone_) {} |
| - template<typename U> zone_allocator(const zone_allocator<U>& other) throw() |
| - : zone_(other.zone_) {} |
| - template<typename U> friend class zone_allocator; |
| + template <typename U> |
| + zone_allocator(const zone_allocator<U>& other) throw() : zone_(other.zone_) {} |
| + template <typename U> |
| + friend class zone_allocator; |
| - pointer address(reference x) const {return &x;} |
| - const_pointer address(const_reference x) const {return &x;} |
| + pointer address(reference x) const { return &x; } |
| + const_pointer address(const_reference x) const { return &x; } |
| pointer allocate(size_type n, const void* hint = 0) { |
| - return static_cast<pointer>(zone_->NewArray<value_type>( |
| - static_cast<int>(n))); |
| + return static_cast<pointer>( |
| + zone_->NewArray<value_type>(static_cast<int>(n))); |
| + } |
| + void deallocate(pointer p, size_type) { /* noop for Zones */ |
| } |
| - void deallocate(pointer p, size_type) { /* noop for Zones */ } |
| size_type max_size() const throw() { |
| return std::numeric_limits<int>::max() / sizeof(value_type); |
| } |
| void construct(pointer p, const T& val) { |
| - new(static_cast<void*>(p)) T(val); |
| + new (static_cast<void*>(p)) T(val); |
| } |
| void destroy(pointer p) { p->~T(); } |