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

rev 8362 : [mq]: hotspot

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 20,35 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONMANAGER_INLINE_HPP
! #define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONMANAGER_INLINE_HPP
  
! #include "gc_implementation/g1/heapRegion.hpp"
! #include "gc_implementation/g1/heapRegionManager.hpp"
! #include "gc_implementation/g1/heapRegionSet.inline.hpp"
  
  inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const {
    assert(addr < heap_end(),
          err_msg("addr: "PTR_FORMAT" end: "PTR_FORMAT, p2i(addr), p2i(heap_end())));
    assert(addr >= heap_bottom(),
--- 20,35 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef SHARE_VM_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
! #define SHARE_VM_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
  
! #include "gc/g1/heapRegion.hpp"
! #include "gc/g1/heapRegionManager.hpp"
! #include "gc/g1/heapRegionSet.inline.hpp"
  
  inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const {
    assert(addr < heap_end(),
          err_msg("addr: "PTR_FORMAT" end: "PTR_FORMAT, p2i(addr), p2i(heap_end())));
    assert(addr >= heap_bottom(),
*** 53,58 ****
  
  inline void HeapRegionManager::allocate_free_regions_starting_at(uint first, uint num_regions) {
    _free_list.remove_starting_at(at(first), num_regions);
  }
  
! #endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONMANAGER_INLINE_HPP
--- 53,58 ----
  
  inline void HeapRegionManager::allocate_free_regions_starting_at(uint first, uint num_regions) {
    _free_list.remove_starting_at(at(first), num_regions);
  }
  
! #endif // SHARE_VM_GC_G1_HEAPREGIONMANAGER_INLINE_HPP