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

rev 8362 : [mq]: hotspot

*** 20,35 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
! #define SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
  
! #include "gc_implementation/g1/g1BlockOffsetTable.hpp"
! #include "gc_implementation/g1/heapRegion.inline.hpp"
! #include "memory/space.hpp"
  
  inline HeapWord* G1BlockOffsetTable::block_start(const void* addr) {
    if (addr >= _bottom && addr < _end) {
      return block_start_unsafe(addr);
    } else {
--- 20,35 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
! #define SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
  
! #include "gc/g1/g1BlockOffsetTable.hpp"
! #include "gc/g1/heapRegion.inline.hpp"
! #include "gc/shared/space.hpp"
  
  inline HeapWord* G1BlockOffsetTable::block_start(const void* addr) {
    if (addr >= _bottom && addr < _end) {
      return block_start_unsafe(addr);
    } else {
*** 170,175 ****
    }
    assert(q <= addr, "wrong order for current and arg");
    return q;
  }
  
! #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
--- 170,175 ----
    }
    assert(q <= addr, "wrong order for current and arg");
    return q;
  }
  
! #endif // SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP