diff src/share/vm/memory/metaspace.hpp @ 14521:29ccc4cbabca

Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 12 Mar 2014 13:30:08 +0100
parents abec000618bf
children 4ca6dc0799b6 62c54fcc0a35
line wrap: on
line diff
--- a/src/share/vm/memory/metaspace.hpp	Tue Mar 11 15:34:06 2014 +0100
+++ b/src/share/vm/memory/metaspace.hpp	Wed Mar 12 13:30:08 2014 +0100
@@ -120,6 +120,7 @@
   static size_t compressed_class_space_size() {
     return _compressed_class_space_size;
   }
+
   static void set_compressed_class_space_size(size_t size) {
     _compressed_class_space_size = size;
   }
@@ -225,7 +226,7 @@
   MetaWord* expand_and_allocate(size_t size,
                                 MetadataType mdtype);
 
-  static bool contains(const void *ptr);
+  bool contains(const void* ptr);
   void dump(outputStream* const out) const;
 
   // Free empty virtualspaces