comparison src/share/vm/gc_implementation/g1/heapRegion.cpp @ 2044:06f017f7daa7

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Fri, 07 Jan 2011 18:18:08 +0100
parents 2d26b0046e0d f95d63e2154a
children d25d4ca69222
comparison
equal deleted inserted replaced
1942:00bc9eaf0e24 2044:06f017f7daa7
20 * or visit www.oracle.com if you need additional information or have any 20 * or visit www.oracle.com if you need additional information or have any
21 * questions. 21 * questions.
22 * 22 *
23 */ 23 */
24 24
25 #include "incls/_precompiled.incl" 25 #include "precompiled.hpp"
26 #include "incls/_heapRegion.cpp.incl" 26 #include "gc_implementation/g1/concurrentZFThread.hpp"
27 #include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp"
28 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
29 #include "gc_implementation/g1/g1OopClosures.inline.hpp"
30 #include "gc_implementation/g1/heapRegion.inline.hpp"
31 #include "gc_implementation/g1/heapRegionRemSet.hpp"
32 #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
33 #include "memory/genOopClosures.inline.hpp"
34 #include "memory/iterator.hpp"
35 #include "oops/oop.inline.hpp"
27 36
28 int HeapRegion::LogOfHRGrainBytes = 0; 37 int HeapRegion::LogOfHRGrainBytes = 0;
29 int HeapRegion::LogOfHRGrainWords = 0; 38 int HeapRegion::LogOfHRGrainWords = 0;
30 int HeapRegion::GrainBytes = 0; 39 int HeapRegion::GrainBytes = 0;
31 int HeapRegion::GrainWords = 0; 40 int HeapRegion::GrainWords = 0;