Mercurial > hg > truffle
diff src/share/vm/memory/allocation.hpp @ 14521:29ccc4cbabca
Merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 12 Mar 2014 13:30:08 +0100 |
parents | d8041d695d19 |
children | 4ca6dc0799b6 |
line wrap: on
line diff
--- a/src/share/vm/memory/allocation.hpp Tue Mar 11 15:34:06 2014 +0100 +++ b/src/share/vm/memory/allocation.hpp Wed Mar 12 13:30:08 2014 +0100 @@ -220,8 +220,11 @@ class StackObj ALLOCATION_SUPER_CLASS_SPEC { private: void* operator new(size_t size) throw(); + void* operator new [](size_t size) throw(); +#ifdef __IBMCPP__ + public: +#endif void operator delete(void* p); - void* operator new [](size_t size) throw(); void operator delete [](void* p); }; @@ -264,7 +267,7 @@ class MetaspaceObj { public: - bool is_metaspace_object() const; // more specific test but slower + bool is_metaspace_object() const; bool is_shared() const; void print_address_on(outputStream* st) const; // nonvirtual address printing @@ -576,8 +579,8 @@ bool allocated_on_res_area() const { return get_allocation_type() == RESOURCE_AREA; } bool allocated_on_C_heap() const { return get_allocation_type() == C_HEAP; } bool allocated_on_arena() const { return get_allocation_type() == ARENA; } - ResourceObj(); // default construtor - ResourceObj(const ResourceObj& r); // default copy construtor + ResourceObj(); // default constructor + ResourceObj(const ResourceObj& r); // default copy constructor ResourceObj& operator=(const ResourceObj& r); // default copy assignment ~ResourceObj(); #endif // ASSERT