Mercurial > hg > graal-compiler
comparison src/share/vm/memory/freeBlockDictionary.cpp @ 13102:f9f4503a4ab5
Merge
author | Christos Kotselidis <christos.kotselidis@oracle.com> |
---|---|
date | Thu, 21 Nov 2013 15:04:54 +0100 |
parents | bdfbb1fb19ca |
children | de6a9e811145 |
comparison
equal
deleted
inserted
replaced
13101:790ebab62d23 | 13102:f9f4503a4ab5 |
---|---|
26 #include "utilities/macros.hpp" | 26 #include "utilities/macros.hpp" |
27 #if INCLUDE_ALL_GCS | 27 #if INCLUDE_ALL_GCS |
28 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp" | 28 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp" |
29 #endif // INCLUDE_ALL_GCS | 29 #endif // INCLUDE_ALL_GCS |
30 #include "memory/freeBlockDictionary.hpp" | 30 #include "memory/freeBlockDictionary.hpp" |
31 #include "memory/metablock.hpp" | |
32 #include "memory/metachunk.hpp" | 31 #include "memory/metachunk.hpp" |
33 #include "runtime/thread.inline.hpp" | 32 #include "runtime/thread.inline.hpp" |
34 #include "utilities/macros.hpp" | 33 #include "utilities/macros.hpp" |
35 | 34 |
36 #ifndef PRODUCT | 35 #ifndef PRODUCT |