1.1 --- a/src/share/vm/memory/tenuredGeneration.cpp Fri Jan 18 05:33:32 2013 -0800
1.2 +++ b/src/share/vm/memory/tenuredGeneration.cpp Wed Jan 23 13:02:39 2013 -0500
1.3 @@ -33,6 +33,7 @@
1.4 #include "memory/tenuredGeneration.hpp"
1.5 #include "oops/oop.inline.hpp"
1.6 #include "runtime/java.hpp"
1.7 +#include "utilities/macros.hpp"
1.8
1.9 TenuredGeneration::TenuredGeneration(ReservedSpace rs,
1.10 size_t initial_byte_size, int level,
1.11 @@ -61,7 +62,7 @@
1.12 _space_counters = new CSpaceCounters(gen_name, 0,
1.13 _virtual_space.reserved_size(),
1.14 _the_space, _gen_counters);
1.15 -#ifndef SERIALGC
1.16 +#if INCLUDE_ALL_GCS
1.17 if (UseParNewGC) {
1.18 typedef ParGCAllocBufferWithBOT* ParGCAllocBufferWithBOTPtr;
1.19 _alloc_buffers = NEW_C_HEAP_ARRAY(ParGCAllocBufferWithBOTPtr,
1.20 @@ -77,7 +78,7 @@
1.21 } else {
1.22 _alloc_buffers = NULL;
1.23 }
1.24 -#endif // SERIALGC
1.25 +#endif // INCLUDE_ALL_GCS
1.26 }
1.27
1.28
1.29 @@ -339,7 +340,7 @@
1.30 }
1.31
1.32
1.33 -#ifndef SERIALGC
1.34 +#if INCLUDE_ALL_GCS
1.35 oop TenuredGeneration::par_promote(int thread_num,
1.36 oop old, markOop m, size_t word_sz) {
1.37
1.38 @@ -423,10 +424,10 @@
1.39 }
1.40 }
1.41
1.42 -#else // SERIALGC
1.43 +#else // INCLUDE_ALL_GCS
1.44 void TenuredGeneration::retire_alloc_buffers_before_full_gc() {}
1.45 void TenuredGeneration::verify_alloc_buffers_clean() {}
1.46 -#endif // SERIALGC
1.47 +#endif // INCLUDE_ALL_GCS
1.48
1.49 bool TenuredGeneration::promotion_attempt_is_safe(size_t max_promotion_in_bytes) const {
1.50 size_t available = max_contiguous_available();
