mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-20 19:14:38 +02:00
Merge
This commit is contained in:
commit
38fac8c706
51 changed files with 418 additions and 242 deletions
|
@ -264,7 +264,7 @@ class ProfilerNode {
|
|||
|
||||
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 @@ class ProfilerNode {
|
|||
}
|
||||
};
|
||||
|
||||
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;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue