Mercurial > hg > truffle
comparison src/share/vm/runtime/objectMonitor.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 | 63a4eb8bcd23 |
comparison
equal
deleted
inserted
replaced
12058:ccb4f2af2319 | 12355:cefad50507d8 |
---|---|
310 static PerfLongVariable * _sync_MonExtant ; | 310 static PerfLongVariable * _sync_MonExtant ; |
311 | 311 |
312 public: | 312 public: |
313 static int Knob_Verbose; | 313 static int Knob_Verbose; |
314 static int Knob_SpinLimit; | 314 static int Knob_SpinLimit; |
315 void* operator new (size_t size) { | 315 void* operator new (size_t size) throw() { |
316 return AllocateHeap(size, mtInternal); | 316 return AllocateHeap(size, mtInternal); |
317 } | 317 } |
318 void* operator new[] (size_t size) { | 318 void* operator new[] (size_t size) throw() { |
319 return operator new (size); | 319 return operator new (size); |
320 } | 320 } |
321 void operator delete(void* p) { | 321 void operator delete(void* p) { |
322 FreeHeap(p, mtInternal); | 322 FreeHeap(p, mtInternal); |
323 } | 323 } |