equal
deleted
inserted
replaced
53 return _instance != NULL; |
53 return _instance != NULL; |
54 } |
54 } |
55 |
55 |
56 bool GCArguments::gc_selected() { |
56 bool GCArguments::gc_selected() { |
57 #if INCLUDE_ALL_GCS |
57 #if INCLUDE_ALL_GCS |
58 return UseSerialGC || UseParallelGC || UseParallelOldGC || UseConcMarkSweepGC || UseG1GC || (UseEpsilonGC || UseNoGC); |
58 return UseSerialGC || UseParallelGC || UseParallelOldGC || UseConcMarkSweepGC || UseG1GC || UseEpsilonGC; |
59 #else |
59 #else |
60 return UseSerialGC; |
60 return UseSerialGC; |
61 #endif // INCLUDE_ALL_GCS |
61 #endif // INCLUDE_ALL_GCS |
62 } |
62 } |
63 |
63 |
145 _instance = new ParallelArguments(); |
145 _instance = new ParallelArguments(); |
146 } else if (UseG1GC) { |
146 } else if (UseG1GC) { |
147 _instance = new G1Arguments(); |
147 _instance = new G1Arguments(); |
148 } else if (UseConcMarkSweepGC) { |
148 } else if (UseConcMarkSweepGC) { |
149 _instance = new CMSArguments(); |
149 _instance = new CMSArguments(); |
150 } else if (UseEpsilonGC || UseNoGC) { |
150 } else if (UseEpsilonGC) { |
151 _instance = new EpsilonArguments(); |
151 _instance = new EpsilonArguments(); |
152 #endif |
152 #endif |
153 } else if (UseSerialGC) { |
153 } else if (UseSerialGC) { |
154 _instance = new SerialArguments(); |
154 _instance = new SerialArguments(); |
155 } else { |
155 } else { |