diff 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
line wrap: on
line diff
--- a/src/share/vm/runtime/objectMonitor.hpp	Thu Oct 10 18:26:22 2013 +0200
+++ b/src/share/vm/runtime/objectMonitor.hpp	Fri Oct 11 10:38:03 2013 +0200
@@ -312,10 +312,10 @@
  public:
   static int Knob_Verbose;
   static int Knob_SpinLimit;
-  void* operator new (size_t size) {
+  void* operator new (size_t size) throw() {
     return AllocateHeap(size, mtInternal);
   }
-  void* operator new[] (size_t size) {
+  void* operator new[] (size_t size) throw() {
     return operator new (size);
   }
   void operator delete(void* p) {