comparison src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp @ 14489:f460c6926af7

Merge
author ehelin
date Tue, 25 Feb 2014 11:02:11 +0100
parents e9d5c28e5059 8a9bb7821e28
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14488:60fd6d24f49f 14489:f460c6926af7
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.