Mercurial > hg > truffle

diff src/share/vm/services/memoryManager.hpp @ 6275:957c266d8bc5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Tue, 21 Aug 2012 10:39:19 +0200
parents d2a62e0f25eb
children b9a9ed0f8eeb
line wrap: on
line diff
--- a/src/share/vm/services/memoryManager.hpp	Mon Aug 20 15:21:31 2012 +0200
+++ b/src/share/vm/services/memoryManager.hpp	Tue Aug 21 10:39:19 2012 +0200
@@ -40,7 +40,7 @@
 class GCMemoryManager;
 class OopClosure;
 
-class MemoryManager : public CHeapObj {
+class MemoryManager : public CHeapObj<mtInternal> {
 private:
   enum {
     max_num_pools = 10