Mercurial > hg > graal-compiler
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/heapRegion.cpp Wed Dec 29 20:06:41 2010 +0100 +++ b/src/share/vm/gc_implementation/g1/heapRegion.cpp Fri Jan 07 18:18:08 2011 +0100 @@ -22,8 +22,17 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_heapRegion.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/concurrentZFThread.hpp" +#include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp" +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1OopClosures.inline.hpp" +#include "gc_implementation/g1/heapRegion.inline.hpp" +#include "gc_implementation/g1/heapRegionRemSet.hpp" +#include "gc_implementation/g1/heapRegionSeq.inline.hpp" +#include "memory/genOopClosures.inline.hpp" +#include "memory/iterator.hpp" +#include "oops/oop.inline.hpp" int HeapRegion::LogOfHRGrainBytes = 0; int HeapRegion::LogOfHRGrainWords = 0;