Mercurial > hg > truffle
diff src/share/vm/memory/allocation.inline.hpp @ 12355:cefad50507d8
Merge with hs25-b53
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 10:38:03 +0200 |
parents | 9758d9f36299 |
children | 833b0f92429a |
line wrap: on
line diff
--- a/src/share/vm/memory/allocation.inline.hpp Thu Oct 10 18:26:22 2013 +0200 +++ b/src/share/vm/memory/allocation.inline.hpp Fri Oct 11 10:38:03 2013 +0200 @@ -85,7 +85,7 @@ template <MEMFLAGS F> void* CHeapObj<F>::operator new(size_t size, - address caller_pc){ + address caller_pc) throw() { void* p = (void*)AllocateHeap(size, F, (caller_pc != 0 ? caller_pc : CALLER_PC)); #ifdef ASSERT if (PrintMallocFree) trace_heap_malloc(size, "CHeapObj-new", p); @@ -94,7 +94,7 @@ } template <MEMFLAGS F> void* CHeapObj<F>::operator new (size_t size, - const std::nothrow_t& nothrow_constant, address caller_pc) { + const std::nothrow_t& nothrow_constant, address caller_pc) throw() { void* p = (void*)AllocateHeap(size, F, (caller_pc != 0 ? caller_pc : CALLER_PC), AllocFailStrategy::RETURN_NULL); #ifdef ASSERT @@ -104,12 +104,12 @@ } template <MEMFLAGS F> void* CHeapObj<F>::operator new [](size_t size, - address caller_pc){ + address caller_pc) throw() { return CHeapObj<F>::operator new(size, caller_pc); } template <MEMFLAGS F> void* CHeapObj<F>::operator new [](size_t size, - const std::nothrow_t& nothrow_constant, address caller_pc) { + const std::nothrow_t& nothrow_constant, address caller_pc) throw() { return CHeapObj<F>::operator new(size, nothrow_constant, caller_pc); }