1.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Wed Feb 26 22:11:26 2014 +0100 1.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Tue Feb 11 09:34:50 2014 +0100 1.3 @@ -1704,8 +1704,8 @@ 1.4 _dictionary->return_chunk(chunk); 1.5 #ifndef PRODUCT 1.6 if (CMSCollector::abstract_state() != CMSCollector::Sweeping) { 1.7 - TreeChunk<FreeChunk, AdaptiveFreeList>* tc = TreeChunk<FreeChunk, AdaptiveFreeList>::as_TreeChunk(chunk); 1.8 - TreeList<FreeChunk, AdaptiveFreeList>* tl = tc->list(); 1.9 + TreeChunk<FreeChunk, AdaptiveFreeList<FreeChunk> >* tc = TreeChunk<FreeChunk, AdaptiveFreeList<FreeChunk> >::as_TreeChunk(chunk); 1.10 + TreeList<FreeChunk, AdaptiveFreeList<FreeChunk> >* tl = tc->list(); 1.11 tl->verify_stats(); 1.12 } 1.13 #endif // PRODUCT 1.14 @@ -2515,10 +2515,10 @@ 1.15 1.16 #ifndef PRODUCT 1.17 void CompactibleFreeListSpace::check_free_list_consistency() const { 1.18 - assert((TreeChunk<FreeChunk, AdaptiveFreeList>::min_size() <= IndexSetSize), 1.19 + assert((TreeChunk<FreeChunk, AdaptiveFreeList<FreeChunk> >::min_size() <= IndexSetSize), 1.20 "Some sizes can't be allocated without recourse to" 1.21 " linear allocation buffers"); 1.22 - assert((TreeChunk<FreeChunk, AdaptiveFreeList>::min_size()*HeapWordSize == sizeof(TreeChunk<FreeChunk, AdaptiveFreeList>)), 1.23 + assert((TreeChunk<FreeChunk, AdaptiveFreeList<FreeChunk> >::min_size()*HeapWordSize == sizeof(TreeChunk<FreeChunk, AdaptiveFreeList<FreeChunk> >)), 1.24 "else MIN_TREE_CHUNK_SIZE is wrong"); 1.25 assert(IndexSetStart != 0, "IndexSetStart not initialized"); 1.26 assert(IndexSetStride != 0, "IndexSetStride not initialized");