diff src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp @ 12356:359f7e70ae7f

Reduce HotSpot diff and fix previous merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 15:41:33 +0200
parents cefad50507d8
children 02f27ecb4f3a
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Fri Oct 11 10:38:03 2013 +0200
+++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Fri Oct 11 15:41:33 2013 +0200
@@ -688,7 +688,6 @@
   #ifdef GRAAL
     HeapWord** top_addr() const;
     HeapWord** end_addr() const;
-
   #endif
 
   // We register a region with the fast "in collection set" test. We