diff options
| author | kvn <none@none> | 2009-03-16 15:06:33 -0700 |
|---|---|---|
| committer | kvn <none@none> | 2009-03-16 15:06:33 -0700 |
| commit | 43d7da75457382d0b5200eb003150cb30d173572 (patch) | |
| tree | 69222a8bb8b3d277fd2fa8941893619c79fcf765 /src/share/vm/gc_implementation | |
| parent | aba66fd3bcf293f960c84f543853f83268b2ea98 (diff) | |
| download | jdk8u_hotspot-43d7da75457382d0b5200eb003150cb30d173572.tar.gz | |
6816308: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
Summary: Allow Hotspot builds with latest Windows SDK 6.1 on 64bit Windows 2003
Reviewed-by: ohair, tbell, jcoomes
Diffstat (limited to 'src/share/vm/gc_implementation')
| -rw-r--r-- | src/share/vm/gc_implementation/g1/concurrentMark.cpp | 2 | ||||
| -rw-r--r-- | src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/src/share/vm/gc_implementation/g1/concurrentMark.cpp index 5b01157e9..7a4f82892 100644 --- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp +++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp @@ -107,7 +107,7 @@ void CMBitMapRO::mostly_disjoint_range_union(BitMap* from_bitmap, #ifndef PRODUCT bool CMBitMapRO::covers(ReservedSpace rs) const { // assert(_bm.map() == _virtual_space.low(), "map inconsistency"); - assert(((size_t)_bm.size() * (1 << _shifter)) == _bmWordSize, + assert(((size_t)_bm.size() * (size_t)(1 << _shifter)) == _bmWordSize, "size inconsistency"); return _bmStartWord == (HeapWord*)(rs.base()) && _bmWordSize == rs.size()>>LogHeapWordSize; diff --git a/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp b/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp index 5e54b0919..dce96d8df 100644 --- a/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp +++ b/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp @@ -508,7 +508,7 @@ OtherRegionsTable::OtherRegionsTable(HeapRegion* hr) : typedef PosParPRT* PosParPRTPtr; if (_max_fine_entries == 0) { assert(_mod_max_fine_entries_mask == 0, "Both or none."); - _max_fine_entries = (1 << G1LogRSRegionEntries); + _max_fine_entries = (size_t)(1 << G1LogRSRegionEntries); _mod_max_fine_entries_mask = _max_fine_entries - 1; #if SAMPLE_FOR_EVICTION assert(_fine_eviction_sample_size == 0 |