src/share/vm/gc/g1/g1MarkSweep.hpp

rev 8362 : [mq]: hotspot

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2013, 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,36 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1MARKSWEEP_HPP
! #define SHARE_VM_GC_IMPLEMENTATION_G1_G1MARKSWEEP_HPP
  
! #include "gc_implementation/g1/g1CollectedHeap.hpp"
! #include "gc_implementation/g1/heapRegion.hpp"
! #include "memory/genMarkSweep.hpp"
! #include "memory/generation.hpp"
  #include "memory/universe.hpp"
  #include "oops/markOop.hpp"
  #include "oops/oop.hpp"
  #include "runtime/timer.hpp"
  #include "utilities/growableArray.hpp"
--- 20,36 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef SHARE_VM_GC_G1_G1MARKSWEEP_HPP
! #define SHARE_VM_GC_G1_G1MARKSWEEP_HPP
  
! #include "gc/g1/g1CollectedHeap.hpp"
! #include "gc/g1/heapRegion.hpp"
! #include "gc/serial/genMarkSweep.hpp"
! #include "gc/shared/generation.hpp"
  #include "memory/universe.hpp"
  #include "oops/markOop.hpp"
  #include "oops/oop.hpp"
  #include "runtime/timer.hpp"
  #include "utilities/growableArray.hpp"
*** 91,96 ****
  
    void update_sets();
    bool doHeapRegion(HeapRegion* hr);
  };
  
! #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1MARKSWEEP_HPP
--- 91,96 ----
  
    void update_sets();
    bool doHeapRegion(HeapRegion* hr);
  };
  
! #endif // SHARE_VM_GC_G1_G1MARKSWEEP_HPP