comparison src/share/vm/memory/freeBlockDictionary.cpp @ 8124:5fc51c1ecdeb

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 23:44:54 +0100
parents db9981fd3124
children bdfbb1fb19ca
comparison
equal deleted inserted replaced
7943:a413bcd552a4 8124:5fc51c1ecdeb
21 * questions. 21 * questions.
22 * 22 *
23 */ 23 */
24 24
25 #include "precompiled.hpp" 25 #include "precompiled.hpp"
26 #ifndef SERIALGC 26 #include "utilities/macros.hpp"
27 #if INCLUDE_ALL_GCS
27 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp" 28 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
28 #endif // SERIALGC 29 #endif // INCLUDE_ALL_GCS
29 #include "memory/freeBlockDictionary.hpp" 30 #include "memory/freeBlockDictionary.hpp"
30 #include "memory/metablock.hpp" 31 #include "memory/metablock.hpp"
31 #include "memory/metachunk.hpp" 32 #include "memory/metachunk.hpp"
32 #include "runtime/thread.inline.hpp" 33 #include "runtime/thread.inline.hpp"
34 #include "utilities/macros.hpp"
33 35
34 #ifndef PRODUCT 36 #ifndef PRODUCT
35 template <class Chunk> Mutex* FreeBlockDictionary<Chunk>::par_lock() const { 37 template <class Chunk> Mutex* FreeBlockDictionary<Chunk>::par_lock() const {
36 return _lock; 38 return _lock;
37 } 39 }
54 #endif 56 #endif
55 57
56 template class FreeBlockDictionary<Metablock>; 58 template class FreeBlockDictionary<Metablock>;
57 template class FreeBlockDictionary<Metachunk>; 59 template class FreeBlockDictionary<Metachunk>;
58 60
59 #ifndef SERIALGC 61 #if INCLUDE_ALL_GCS
60 // Explicitly instantiate for FreeChunk 62 // Explicitly instantiate for FreeChunk
61 template class FreeBlockDictionary<FreeChunk>; 63 template class FreeBlockDictionary<FreeChunk>;
62 #endif // SERIALGC 64 #endif // INCLUDE_ALL_GCS