1.1 --- a/src/share/vm/memory/tenuredGeneration.hpp Wed Feb 06 15:22:32 2013 -0800
1.2 +++ b/src/share/vm/memory/tenuredGeneration.hpp Thu Feb 07 16:05:48 2013 -0500
1.3 @@ -29,6 +29,7 @@
1.4 #include "gc_implementation/shared/gcStats.hpp"
1.5 #include "gc_implementation/shared/generationCounters.hpp"
1.6 #include "memory/generation.hpp"
1.7 +#include "utilities/macros.hpp"
1.8
1.9 // TenuredGeneration models the heap containing old (promoted/tenured) objects.
1.10
1.11 @@ -45,11 +46,11 @@
1.12 size_t _capacity_at_prologue;
1.13 size_t _used_at_prologue;
1.14
1.15 -#ifndef SERIALGC
1.16 +#if INCLUDE_ALL_GCS
1.17 // To support parallel promotion: an array of parallel allocation
1.18 // buffers, one per thread, initially NULL.
1.19 ParGCAllocBufferWithBOT** _alloc_buffers;
1.20 -#endif // SERIALGC
1.21 +#endif // INCLUDE_ALL_GCS
1.22
1.23 // Retire all alloc buffers before a full GC, so that they will be
1.24 // re-allocated at the start of the next young GC.
1.25 @@ -93,14 +94,14 @@
1.26 size_t size,
1.27 bool is_tlab);
1.28
1.29 -#ifndef SERIALGC
1.30 +#if INCLUDE_ALL_GCS
1.31 // Overrides.
1.32 virtual oop par_promote(int thread_num,
1.33 oop obj, markOop m, size_t word_sz);
1.34 virtual void par_promote_alloc_undo(int thread_num,
1.35 HeapWord* obj, size_t word_sz);
1.36 virtual void par_promote_alloc_done(int thread_num);
1.37 -#endif // SERIALGC
1.38 +#endif // INCLUDE_ALL_GCS
1.39
1.40 // Performance Counter support
1.41 void update_counters();
