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:
Vladimir Kozlov 2015-04-16 14:05:48 -07:00
commit b9c00b1904
256 changed files with 5873 additions and 4093 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hotspot/src/share/vm/runtime/vmStructs.cpp
View file

@ -558,7 +558,6 @@ typedef CompactHashtable<Symbol*, char> SymbolCompactHashTable;
static_field(GenCollectedHeap, _gch, GenCollectedHeap*) \
nonstatic_field(GenCollectedHeap, _young_gen, Generation*) \
nonstatic_field(GenCollectedHeap, _old_gen, Generation*) \
nonstatic_field(GenCollectedHeap, _n_gens, int) \
\
nonstatic_field(GenCollectorPolicy, _young_gen_spec, GenerationSpec*) \
nonstatic_field(GenCollectorPolicy, _old_gen_spec, GenerationSpec*) \
@ -1501,8 +1500,7 @@ typedef CompactHashtable<Symbol*, char> SymbolCompactHashTable;
/******************************************/ \
\
declare_toplevel_type(CollectedHeap) \
declare_type(SharedHeap, CollectedHeap) \
declare_type(GenCollectedHeap, SharedHeap) \
declare_type(GenCollectedHeap, CollectedHeap) \
declare_toplevel_type(Generation) \
declare_type(DefNewGeneration, Generation) \
declare_type(CardGeneration, Generation) \
@ -2265,8 +2263,6 @@ typedef CompactHashtable<Symbol*, char> SymbolCompactHashTable;
declare_constant(CollectedHeap::ParallelScavengeHeap) \
declare_constant(CollectedHeap::G1CollectedHeap) \
\
declare_constant(GenCollectedHeap::max_gens) \
\
/* constants from Generation::Name enum */ \
\
declare_constant(Generation::DefNew) \