diff src/share/vm/services/memoryManager.cpp @ 11198:1e6d5dec4a4e

Merge.
author Christian Humer <christian.humer@gmail.com>
date Mon, 05 Aug 2013 13:20:06 +0200
parents 71963b3f802a
children 190899198332
line wrap: on
line diff
--- a/src/share/vm/services/memoryManager.cpp	Thu Aug 01 21:34:57 2013 +0200
+++ b/src/share/vm/services/memoryManager.cpp	Mon Aug 05 13:20:06 2013 +0200
@@ -61,6 +61,10 @@
   return (MemoryManager*) new CodeCacheMemoryManager();
 }
 
+MemoryManager* MemoryManager::get_metaspace_memory_manager() {
+  return (MemoryManager*) new MetaspaceMemoryManager();
+}
+
 GCMemoryManager* MemoryManager::get_copy_memory_manager() {
   return (GCMemoryManager*) new CopyMemoryManager();
 }