src/share/vm/gc/g1/heapRegion.inline.hpp

rev 8362 : [mq]: hotspot

*** 20,36 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_INLINE_HPP
! #define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_INLINE_HPP
  
! #include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp"
! #include "gc_implementation/g1/g1CollectedHeap.hpp"
! #include "gc_implementation/g1/heapRegion.hpp"
! #include "memory/space.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/atomic.inline.hpp"
  
  // This version requires locking.
  inline HeapWord* G1OffsetTableContigSpace::allocate_impl(size_t size,
--- 20,36 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP
! #define SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP
  
! #include "gc/g1/g1BlockOffsetTable.inline.hpp"
! #include "gc/g1/g1CollectedHeap.hpp"
! #include "gc/g1/heapRegion.hpp"
! #include "gc/shared/space.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/atomic.inline.hpp"
  
  // This version requires locking.
  inline HeapWord* G1OffsetTableContigSpace::allocate_impl(size_t size,
*** 198,203 ****
  
  inline bool HeapRegion::in_collection_set() const {
    return G1CollectedHeap::heap()->is_in_cset(this);
  }
  
! #endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_INLINE_HPP
--- 198,203 ----
  
  inline bool HeapRegion::in_collection_set() const {
    return G1CollectedHeap::heap()->is_in_cset(this);
  }
  
! #endif // SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP