Mercurial > hg > graal-compiler
diff src/share/vm/oops/cpCache.cpp @ 8002:8391fdd36e1f
Merge
author | dlong |
---|---|
date | Sun, 27 Jan 2013 01:07:09 -0800 |
parents | db9981fd3124 |
children | 461a3adac4d1 |
line wrap: on
line diff
--- a/src/share/vm/oops/cpCache.cpp Fri Jan 25 03:03:23 2013 -0800 +++ b/src/share/vm/oops/cpCache.cpp Sun Jan 27 01:07:09 2013 -0800 @@ -33,9 +33,10 @@ #include "prims/jvmtiRedefineClassesTrace.hpp" #include "prims/methodHandles.hpp" #include "runtime/handles.inline.hpp" -#ifndef SERIALGC +#include "utilities/macros.hpp" +#if INCLUDE_ALL_GCS # include "gc_implementation/parallelScavenge/psPromotionManager.hpp" -#endif +#endif // INCLUDE_ALL_GCS // Implememtation of ConstantPoolCacheEntry