1.1 --- a/src/share/vm/memory/collectorPolicy.hpp Fri Jan 18 05:33:32 2013 -0800
1.2 +++ b/src/share/vm/memory/collectorPolicy.hpp Wed Jan 23 13:02:39 2013 -0500
1.3 @@ -29,6 +29,7 @@
1.4 #include "memory/barrierSet.hpp"
1.5 #include "memory/generationSpec.hpp"
1.6 #include "memory/genRemSet.hpp"
1.7 +#include "utilities/macros.hpp"
1.8
1.9 // This class (or more correctly, subtypes of this class)
1.10 // are used to define global garbage collector attributes.
1.11 @@ -48,10 +49,10 @@
1.12 class GenCollectorPolicy;
1.13 class TwoGenerationCollectorPolicy;
1.14 class AdaptiveSizePolicy;
1.15 -#ifndef SERIALGC
1.16 +#if INCLUDE_ALL_GCS
1.17 class ConcurrentMarkSweepPolicy;
1.18 class G1CollectorPolicy;
1.19 -#endif // SERIALGC
1.20 +#endif // INCLUDE_ALL_GCS
1.21
1.22 class GCPolicyCounters;
1.23 class MarkSweepPolicy;
1.24 @@ -134,21 +135,21 @@
1.25 virtual GenCollectorPolicy* as_generation_policy() { return NULL; }
1.26 virtual TwoGenerationCollectorPolicy* as_two_generation_policy() { return NULL; }
1.27 virtual MarkSweepPolicy* as_mark_sweep_policy() { return NULL; }
1.28 -#ifndef SERIALGC
1.29 +#if INCLUDE_ALL_GCS
1.30 virtual ConcurrentMarkSweepPolicy* as_concurrent_mark_sweep_policy() { return NULL; }
1.31 virtual G1CollectorPolicy* as_g1_policy() { return NULL; }
1.32 -#endif // SERIALGC
1.33 +#endif // INCLUDE_ALL_GCS
1.34 // Note that these are not virtual.
1.35 bool is_generation_policy() { return as_generation_policy() != NULL; }
1.36 bool is_two_generation_policy() { return as_two_generation_policy() != NULL; }
1.37 bool is_mark_sweep_policy() { return as_mark_sweep_policy() != NULL; }
1.38 -#ifndef SERIALGC
1.39 +#if INCLUDE_ALL_GCS
1.40 bool is_concurrent_mark_sweep_policy() { return as_concurrent_mark_sweep_policy() != NULL; }
1.41 bool is_g1_policy() { return as_g1_policy() != NULL; }
1.42 -#else // SERIALGC
1.43 +#else // INCLUDE_ALL_GCS
1.44 bool is_concurrent_mark_sweep_policy() { return false; }
1.45 bool is_g1_policy() { return false; }
1.46 -#endif // SERIALGC
1.47 +#endif // INCLUDE_ALL_GCS
1.48
1.49
1.50 virtual BarrierSet::Name barrier_set_name() = 0;
