Mercurial > hg > graal-jvmci-8
comparison src/share/vm/memory/allocation.hpp @ 14460:8a9bb7821e28
Merge
author | kvn |
---|---|
date | Wed, 19 Feb 2014 12:08:49 -0800 |
parents | 63a4eb8bcd23 abec000618bf |
children | d8041d695d19 |
comparison
equal
deleted
inserted
replaced
14360:e8ef156f0bc9 | 14460:8a9bb7821e28 |
---|---|
218 // Calling new or delete will result in fatal error. | 218 // Calling new or delete will result in fatal error. |
219 | 219 |
220 class StackObj ALLOCATION_SUPER_CLASS_SPEC { | 220 class StackObj ALLOCATION_SUPER_CLASS_SPEC { |
221 private: | 221 private: |
222 void* operator new(size_t size) throw(); | 222 void* operator new(size_t size) throw(); |
223 void* operator new [](size_t size) throw(); | |
224 #ifdef __IBMCPP__ | |
225 public: | |
226 #endif | |
223 void operator delete(void* p); | 227 void operator delete(void* p); |
224 void* operator new [](size_t size) throw(); | |
225 void operator delete [](void* p); | 228 void operator delete [](void* p); |
226 }; | 229 }; |
227 | 230 |
228 // Base class for objects used as value objects. | 231 // Base class for objects used as value objects. |
229 // Calling new or delete will result in fatal error. | 232 // Calling new or delete will result in fatal error. |