Mercurial > hg > graal-jvmci-8

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author coleenp
date Mon, 02 Jul 2012 13:11:28 -0400
parents d2a62e0f25eb
children 988bf00cc564
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/concurrentMark.hpp	Fri Jun 29 17:12:15 2012 -0700
+++ b/src/share/vm/gc_implementation/g1/concurrentMark.hpp	Mon Jul 02 13:11:28 2012 -0400
@@ -30,8 +30,8 @@
 
 class G1CollectedHeap;
 class CMTask;
-typedef GenericTaskQueue<oop>            CMTaskQueue;
-typedef GenericTaskQueueSet<CMTaskQueue> CMTaskQueueSet;
+typedef GenericTaskQueue<oop, mtGC>            CMTaskQueue;
+typedef GenericTaskQueueSet<CMTaskQueue, mtGC> CMTaskQueueSet;
 
 // Closure used by CM during concurrent reference discovery
 // and reference processing (during remarking) to determine
@@ -343,7 +343,7 @@
 
 class ConcurrentMarkThread;
 
-class ConcurrentMark : public CHeapObj {
+class ConcurrentMark: public CHeapObj<mtGC> {
   friend class ConcurrentMarkThread;
   friend class CMTask;
   friend class CMBitMapClosure;