| Index: src/zone-inl.h
|
| diff --git a/src/zone-inl.h b/src/zone-inl.h
|
| index 6e2d558a60625a1fb055c6a5c52ffd5bc44ec622..90817dad1b5778f514a995926b85dbc175adecfe 100644
|
| --- a/src/zone-inl.h
|
| +++ b/src/zone-inl.h
|
| @@ -86,7 +86,7 @@ ZoneSplayTree<Config>::~ZoneSplayTree() {
|
| // Reset the root to avoid unneeded iteration over all tree nodes
|
| // in the destructor. For a zone-allocated tree, nodes will be
|
| // freed by the Zone.
|
| - SplayTree<Config, ZoneListAllocationPolicy>::ResetRoot();
|
| + SplayTree<Config, ZoneListAllocator>::ResetRoot();
|
| }
|
|
|
|
|
| @@ -102,20 +102,20 @@ void* ZoneObject::operator new(size_t size, Zone* zone) {
|
| }
|
|
|
|
|
| -inline void* ZoneListAllocationPolicy::New(int size) {
|
| +inline void* ZoneListAllocator::New(int size) {
|
| return ZONE->New(size);
|
| }
|
|
|
|
|
| template <typename T>
|
| -void* ZoneList<T>::operator new(size_t size) {
|
| - return ZONE->New(static_cast<int>(size));
|
| +void* ZoneList<T>::operator new(size_t size, Zone* zone) {
|
| + return zone->New(static_cast<int>(size));
|
| }
|
|
|
|
|
| -template <typename T>
|
| -void* ZoneList<T>::operator new(size_t size, Zone* zone) {
|
| - return zone->New(static_cast<int>(size));
|
| +template<typename T>
|
| +ZoneList<T>* ZoneList<T>::New(Zone* zone, int capacity) {
|
| + return new(zone) ZoneList(zone, capacity);
|
| }
|
|
|
|
|
|
|