Mercurial > hg > truffle
comparison src/share/vm/memory/memRegion.cpp @ 14422:2b8e28fdf503
Merge
author | kvn |
---|---|
date | Tue, 05 Nov 2013 17:38:04 -0800 |
parents | 9758d9f36299 |
children | 833b0f92429a |
comparison
equal
deleted
inserted
replaced
14421:3068270ba476 | 14422:2b8e28fdf503 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
100 } | 100 } |
101 ShouldNotReachHere(); | 101 ShouldNotReachHere(); |
102 return MemRegion(); | 102 return MemRegion(); |
103 } | 103 } |
104 | 104 |
105 void* MemRegion::operator new(size_t size) { | 105 void* MemRegion::operator new(size_t size) throw() { |
106 return (address)AllocateHeap(size, mtGC, 0, AllocFailStrategy::RETURN_NULL); | 106 return (address)AllocateHeap(size, mtGC, 0, AllocFailStrategy::RETURN_NULL); |
107 } | 107 } |
108 | 108 |
109 void* MemRegion::operator new [](size_t size) { | 109 void* MemRegion::operator new [](size_t size) throw() { |
110 return (address)AllocateHeap(size, mtGC, 0, AllocFailStrategy::RETURN_NULL); | 110 return (address)AllocateHeap(size, mtGC, 0, AllocFailStrategy::RETURN_NULL); |
111 } | 111 } |
112 void MemRegion::operator delete(void* p) { | 112 void MemRegion::operator delete(void* p) { |
113 FreeHeap(p, mtGC); | 113 FreeHeap(p, mtGC); |
114 } | 114 } |