Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1090)

Side by Side Diff: src/zone.h

Issue 22554002: Pacify Win7 builders (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 // different configurations of a concrete splay tree (see splay-tree.h). 242 // different configurations of a concrete splay tree (see splay-tree.h).
243 // The tree itself and all its elements are allocated in the Zone. 243 // The tree itself and all its elements are allocated in the Zone.
244 template <typename Config> 244 template <typename Config>
245 class ZoneSplayTree: public SplayTree<Config, ZoneAllocationPolicy> { 245 class ZoneSplayTree: public SplayTree<Config, ZoneAllocationPolicy> {
246 public: 246 public:
247 explicit ZoneSplayTree(Zone* zone) 247 explicit ZoneSplayTree(Zone* zone)
248 : SplayTree<Config, ZoneAllocationPolicy>(ZoneAllocationPolicy(zone)) {} 248 : SplayTree<Config, ZoneAllocationPolicy>(ZoneAllocationPolicy(zone)) {}
249 ~ZoneSplayTree(); 249 ~ZoneSplayTree();
250 250
251 INLINE(void* operator new(size_t size, Zone* zone)); 251 INLINE(void* operator new(size_t size, Zone* zone));
252
253 void operator delete(void* pointer) { UNREACHABLE(); }
254 void operator delete(void* pointer, Zone* zone) { UNREACHABLE(); }
252 }; 255 };
253 256
254 257
255 typedef TemplateHashMapImpl<ZoneAllocationPolicy> ZoneHashMap; 258 typedef TemplateHashMapImpl<ZoneAllocationPolicy> ZoneHashMap;
256 259
257 } } // namespace v8::internal 260 } } // namespace v8::internal
258 261
259 #endif // V8_ZONE_H_ 262 #endif // V8_ZONE_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698