Mercurial > hg > graal-compiler

diff src/share/vm/oops/oop.pcgc.inline.hpp @ 8002:8391fdd36e1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author dlong
date Sun, 27 Jan 2013 01:07:09 -0800
parents db9981fd3124
children ad72068ac41e
line wrap: on
line diff
--- a/src/share/vm/oops/oop.pcgc.inline.hpp	Fri Jan 25 03:03:23 2013 -0800
+++ b/src/share/vm/oops/oop.pcgc.inline.hpp	Sun Jan 27 01:07:09 2013 -0800
@@ -25,14 +25,15 @@
 #ifndef SHARE_VM_OOPS_OOP_PCGC_INLINE_HPP
 #define SHARE_VM_OOPS_OOP_PCGC_INLINE_HPP
 
-#ifndef SERIALGC
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
 #include "gc_implementation/parNew/parNewGeneration.hpp"
 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
 #include "gc_implementation/parallelScavenge/psCompactionManager.hpp"
 #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
 #include "gc_implementation/parallelScavenge/psScavenge.hpp"
 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
-#endif
+#endif // INCLUDE_ALL_GCS
 
 inline void oopDesc::update_contents(ParCompactionManager* cm) {
   // The klass field must be updated before anything else