Mercurial > hg > truffle

diff src/share/vm/runtime/fprofiler.cpp @ 12149:491de79915eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author zgu
date Fri, 30 Aug 2013 12:22:02 -0400
parents 522d69638aa8 9758d9f36299
children 78bbf4d43a14
line wrap: on
line diff
--- a/src/share/vm/runtime/fprofiler.cpp	Fri Aug 30 11:54:14 2013 -0400
+++ b/src/share/vm/runtime/fprofiler.cpp	Fri Aug 30 12:22:02 2013 -0400
@@ -264,7 +264,7 @@
 
  public:
 
-  void* operator new(size_t size, ThreadProfiler* tp);
+  void* operator new(size_t size, ThreadProfiler* tp) throw();
   void  operator delete(void* p);
 
   ProfilerNode() {
@@ -373,7 +373,7 @@
   }
 };
 
-void* ProfilerNode::operator new(size_t size, ThreadProfiler* tp){
+void* ProfilerNode::operator new(size_t size, ThreadProfiler* tp) throw() {
   void* result = (void*) tp->area_top;
   tp->area_top += size;