Mercurial > hg > graal-jvmci-8
comparison src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp @ 14460:8a9bb7821e28
Merge
author | kvn |
---|---|
date | Wed, 19 Feb 2014 12:08:49 -0800 |
parents | 63a4eb8bcd23 d2907f74462e |
children | f460c6926af7 |
comparison
equal
deleted
inserted
replaced
14360:e8ef156f0bc9 | 14460:8a9bb7821e28 |
---|---|
27 | 27 |
28 #include "gc_implementation/g1/concurrentMark.inline.hpp" | 28 #include "gc_implementation/g1/concurrentMark.inline.hpp" |
29 #include "gc_implementation/g1/g1CollectedHeap.hpp" | 29 #include "gc_implementation/g1/g1CollectedHeap.hpp" |
30 #include "gc_implementation/g1/g1OopClosures.hpp" | 30 #include "gc_implementation/g1/g1OopClosures.hpp" |
31 #include "gc_implementation/g1/g1RemSet.hpp" | 31 #include "gc_implementation/g1/g1RemSet.hpp" |
32 #include "gc_implementation/g1/g1RemSet.inline.hpp" | |
32 #include "gc_implementation/g1/heapRegionRemSet.hpp" | 33 #include "gc_implementation/g1/heapRegionRemSet.hpp" |
33 | 34 |
34 /* | 35 /* |
35 * This really ought to be an inline function, but apparently the C++ | 36 * This really ought to be an inline function, but apparently the C++ |
36 * compiler sometimes sees fit to ignore inline declarations. Sigh. | 37 * compiler sometimes sees fit to ignore inline declarations. Sigh. |