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

Merge
author coleenp
date Mon, 02 Jul 2012 13:11:28 -0400
parents 7994a5a35fcf d2a62e0f25eb
children db823a892a55
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp	Fri Jun 29 17:12:15 2012 -0700
+++ b/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp	Mon Jul 02 13:11:28 2012 -0400
@@ -165,7 +165,7 @@
   static void print_from_card_cache();
 };
 
-class HeapRegionRemSet : public CHeapObj {
+class HeapRegionRemSet : public CHeapObj<mtGC> {
   friend class VMStructs;
   friend class HeapRegionRemSetIterator;
 
@@ -332,7 +332,7 @@
 #endif
 };
 
-class HeapRegionRemSetIterator : public CHeapObj {
+class HeapRegionRemSetIterator : public CHeapObj<mtGC> {
 
   // The region over which we're iterating.
   const HeapRegionRemSet* _hrrs;