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

Merge
author coleenp
date Mon, 02 Jul 2012 13:11:28 -0400
parents d2a62e0f25eb
children b9a9ed0f8eeb
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/g1MMUTracker.hpp	Fri Jun 29 17:12:15 2012 -0700
+++ b/src/share/vm/gc_implementation/g1/g1MMUTracker.hpp	Mon Jul 02 13:11:28 2012 -0400
@@ -34,7 +34,7 @@
 /***** ALL TIMES ARE IN SECS!!!!!!! *****/
 
 // this is the "interface"
-class G1MMUTracker: public CHeapObj {
+class G1MMUTracker: public CHeapObj<mtGC> {
 protected:
   double          _time_slice;
   double          _max_gc_time; // this is per time slice