diff src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp @ 6198:24b9c7f4cae6

Merge
author coleenp
date Mon, 02 Jul 2012 13:11:28 -0400
parents d2a62e0f25eb
children f99a36499b8c
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp	Fri Jun 29 17:12:15 2012 -0700
+++ b/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp	Mon Jul 02 13:11:28 2012 -0400
@@ -117,7 +117,7 @@
 
 // Here is the shared array type.
 
-class G1BlockOffsetSharedArray: public CHeapObj {
+class G1BlockOffsetSharedArray: public CHeapObj<mtGC> {
   friend class G1BlockOffsetArray;
   friend class G1BlockOffsetArrayContigSpace;
   friend class VMStructs;