archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Chris Hegarty 2013-06-17 11:17:49 +01:00
commit ae4642e749
448 changed files with 22114 additions and 7211 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hotspot/src/share/vm/memory/allocation.cpp
View file

@ -60,10 +60,11 @@ void* _ValueObj::operator new [](size_t size) { ShouldNotCallThis(); return 0;
void _ValueObj::operator delete [](void* p) { ShouldNotCallThis(); }
void* MetaspaceObj::operator new(size_t size, ClassLoaderData* loader_data,
size_t word_size, bool read_only, TRAPS) {
size_t word_size, bool read_only,
MetaspaceObj::Type type, TRAPS) {
// Klass has it's own operator new
return Metaspace::allocate(loader_data, word_size, read_only,
Metaspace::NonClassType, CHECK_NULL);
type, CHECK_NULL);
}
bool MetaspaceObj::is_shared() const {