Mercurial > hg > truffle

diff src/share/vm/memory/universe.cpp @ 20771:9fa3bf3043a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Wed, 26 Nov 2014 08:14:21 -0800
parents b840813adfcc
children d3f3f7677537
line wrap: on
line diff
--- a/src/share/vm/memory/universe.cpp	Wed Nov 19 12:52:56 2014 -0800
+++ b/src/share/vm/memory/universe.cpp	Wed Nov 26 08:14:21 2014 -0800
@@ -78,7 +78,7 @@
 #include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp"
 #include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp"
 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
-#include "gc_implementation/g1/g1CollectorPolicy.hpp"
+#include "gc_implementation/g1/g1CollectorPolicy_ext.hpp"
 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
 #endif // INCLUDE_ALL_GCS
 
@@ -798,7 +798,7 @@
 
   } else if (UseG1GC) {
 #if INCLUDE_ALL_GCS
-    G1CollectorPolicy* g1p = new G1CollectorPolicy();
+    G1CollectorPolicyExt* g1p = new G1CollectorPolicyExt();
     g1p->initialize_all();
     G1CollectedHeap* g1h = new G1CollectedHeap(g1p);
     Universe::_collectedHeap = g1h;