comparison src/share/vm/services/psMemoryPool.hpp @ 8002:8391fdd36e1f

Merge
author dlong
date Sun, 27 Jan 2013 01:07:09 -0800
parents db9981fd3124
children de6a9e811145
comparison
equal deleted inserted replaced
7946:6fbe8a57549d 8002:8391fdd36e1f
23 */ 23 */
24 24
25 #ifndef SHARE_VM_SERVICES_PSMEMORYPOOL_HPP 25 #ifndef SHARE_VM_SERVICES_PSMEMORYPOOL_HPP
26 #define SHARE_VM_SERVICES_PSMEMORYPOOL_HPP 26 #define SHARE_VM_SERVICES_PSMEMORYPOOL_HPP
27 27
28 #ifndef SERIALGC 28 #include "utilities/macros.hpp"
29 #if INCLUDE_ALL_GCS
29 #include "gc_implementation/parallelScavenge/psOldGen.hpp" 30 #include "gc_implementation/parallelScavenge/psOldGen.hpp"
30 #include "gc_implementation/parallelScavenge/psYoungGen.hpp" 31 #include "gc_implementation/parallelScavenge/psYoungGen.hpp"
31 #include "gc_implementation/shared/mutableSpace.hpp" 32 #include "gc_implementation/shared/mutableSpace.hpp"
32 #include "memory/defNewGeneration.hpp" 33 #include "memory/defNewGeneration.hpp"
33 #include "memory/heap.hpp" 34 #include "memory/heap.hpp"
34 #include "memory/space.hpp" 35 #include "memory/space.hpp"
35 #include "services/memoryPool.hpp" 36 #include "services/memoryPool.hpp"
36 #include "services/memoryUsage.hpp" 37 #include "services/memoryUsage.hpp"
37 #endif 38 #endif // INCLUDE_ALL_GCS
38 39
39 class PSGenerationPool : public CollectedMemoryPool { 40 class PSGenerationPool : public CollectedMemoryPool {
40 private: 41 private:
41 PSOldGen* _gen; 42 PSOldGen* _gen;
42 43