comparison src/share/vm/memory/allocation.hpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents 1baf7f1e3f23 59c790074993
children 989155e2d07a
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
246 class ClassLoaderData; 246 class ClassLoaderData;
247 247
248 class MetaspaceObj { 248 class MetaspaceObj {
249 public: 249 public:
250 bool is_metadata() const; 250 bool is_metadata() const;
251 bool is_metaspace_object() const; // more specific test but slower
251 bool is_shared() const; 252 bool is_shared() const;
252 void print_address_on(outputStream* st) const; // nonvirtual address printing 253 void print_address_on(outputStream* st) const; // nonvirtual address printing
253 254
254 void* operator new(size_t size, ClassLoaderData* loader_data, 255 void* operator new(size_t size, ClassLoaderData* loader_data,
255 size_t word_size, bool read_only, Thread* thread); 256 size_t word_size, bool read_only, Thread* thread);