1.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.hpp Mon Sep 12 16:09:50 2011 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.hpp Wed Oct 05 08:44:10 2011 -0700
1.3 @@ -346,16 +346,12 @@
1.4 G1BlockOffsetSharedArray* sharedOffsetArray,
1.5 MemRegion mr, bool is_zeroed);
1.6
1.7 - static int LogOfHRGrainBytes;
1.8 - static int LogOfHRGrainWords;
1.9 - // The normal type of these should be size_t. However, they used to
1.10 - // be members of an enum before and they are assumed by the
1.11 - // compilers to be ints. To avoid going and fixing all their uses,
1.12 - // I'm declaring them as ints. I'm not anticipating heap region
1.13 - // sizes to reach anywhere near 2g, so using an int here is safe.
1.14 - static int GrainBytes;
1.15 - static int GrainWords;
1.16 - static int CardsPerRegion;
1.17 + static int LogOfHRGrainBytes;
1.18 + static int LogOfHRGrainWords;
1.19 +
1.20 + static size_t GrainBytes;
1.21 + static size_t GrainWords;
1.22 + static size_t CardsPerRegion;
1.23
1.24 static size_t align_up_to_region_byte_size(size_t sz) {
1.25 return (sz + (size_t) GrainBytes - 1) &
