comparison src/share/vm/gc_implementation/g1/g1AllocRegion.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 dee7c8b578c7
children 096c224171c4
comparison
equal deleted inserted replaced
12355:cefad50507d8 12356:359f7e70ae7f
181 HeapWord** end_addr() const { 181 HeapWord** end_addr() const {
182 return _alloc_region->end_addr(); 182 return _alloc_region->end_addr();
183 } 183 }
184 #endif 184 #endif
185 185
186 #if G1_ALLOC_REGION_TRACING 186 #if G1_ALLOC_REGION_TRACING
187 void trace(const char* str, size_t word_size = 0, HeapWord* result = NULL); 187 void trace(const char* str, size_t word_size = 0, HeapWord* result = NULL);
188 #else // G1_ALLOC_REGION_TRACING 188 #else // G1_ALLOC_REGION_TRACING
189 void trace(const char* str, size_t word_size = 0, HeapWord* result = NULL) { } 189 void trace(const char* str, size_t word_size = 0, HeapWord* result = NULL) { }
190 #endif // G1_ALLOC_REGION_TRACING 190 #endif // G1_ALLOC_REGION_TRACING
191 }; 191 };