1.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.cpp Wed Aug 27 09:36:55 2014 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.cpp Tue Aug 26 09:36:53 2014 +0200
1.3 @@ -29,7 +29,7 @@
1.4 #include "gc_implementation/g1/g1OopClosures.inline.hpp"
1.5 #include "gc_implementation/g1/heapRegion.inline.hpp"
1.6 #include "gc_implementation/g1/heapRegionRemSet.hpp"
1.7 -#include "gc_implementation/g1/heapRegionSeq.inline.hpp"
1.8 +#include "gc_implementation/g1/heapRegionManager.inline.hpp"
1.9 #include "gc_implementation/shared/liveRange.hpp"
1.10 #include "memory/genOopClosures.inline.hpp"
1.11 #include "memory/iterator.hpp"
1.12 @@ -344,11 +344,11 @@
1.13 return low;
1.14 }
1.15
1.16 -HeapRegion::HeapRegion(uint hrs_index,
1.17 +HeapRegion::HeapRegion(uint hrm_index,
1.18 G1BlockOffsetSharedArray* sharedOffsetArray,
1.19 MemRegion mr) :
1.20 G1OffsetTableContigSpace(sharedOffsetArray, mr),
1.21 - _hrs_index(hrs_index),
1.22 + _hrm_index(hrm_index),
1.23 _humongous_type(NotHumongous), _humongous_start_region(NULL),
1.24 _in_collection_set(false),
1.25 _next_in_special_set(NULL), _orig_end(NULL),
