1.1 --- a/src/share/vm/memory/generationSpec.cpp Wed Feb 06 15:22:32 2013 -0800
1.2 +++ b/src/share/vm/memory/generationSpec.cpp Thu Feb 07 16:05:48 2013 -0500
1.3 @@ -30,11 +30,12 @@
1.4 #include "memory/generationSpec.hpp"
1.5 #include "memory/tenuredGeneration.hpp"
1.6 #include "runtime/java.hpp"
1.7 -#ifndef SERIALGC
1.8 +#include "utilities/macros.hpp"
1.9 +#if INCLUDE_ALL_GCS
1.10 #include "gc_implementation/parNew/asParNewGeneration.hpp"
1.11 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
1.12 #include "gc_implementation/parNew/parNewGeneration.hpp"
1.13 -#endif
1.14 +#endif // INCLUDE_ALL_GCS
1.15
1.16 Generation* GenerationSpec::init(ReservedSpace rs, int level,
1.17 GenRemSet* remset) {
1.18 @@ -45,7 +46,7 @@
1.19 case Generation::MarkSweepCompact:
1.20 return new TenuredGeneration(rs, init_size(), level, remset);
1.21
1.22 -#ifndef SERIALGC
1.23 +#if INCLUDE_ALL_GCS
1.24 case Generation::ParNew:
1.25 return new ParNewGeneration(rs, init_size(), level);
1.26
1.27 @@ -94,7 +95,7 @@
1.28
1.29 return g;
1.30 }
1.31 -#endif // SERIALGC
1.32 +#endif // INCLUDE_ALL_GCS
1.33
1.34 default:
1.35 guarantee(false, "unrecognized GenerationName");
