src/share/vm/gc/parallel/parallelScavengeHeap.inline.hpp

rev 8362 : [mq]: hotspot

*** 1,7 ****
  /*
!  * Copyright (c) 2006, 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) 2006, 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_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_INLINE_HPP
! #define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_INLINE_HPP
  
! #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
! #include "gc_implementation/parallelScavenge/psMarkSweep.hpp"
! #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
! #include "gc_implementation/parallelScavenge/psScavenge.hpp"
  
  inline size_t ParallelScavengeHeap::total_invocations()
  {
    return UseParallelOldGC ? PSParallelCompact::total_invocations() :
      PSMarkSweep::total_invocations();
--- 20,36 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
! #define SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
  
! #include "gc/parallel/parallelScavengeHeap.hpp"
! #include "gc/parallel/psMarkSweep.hpp"
! #include "gc/parallel/psParallelCompact.hpp"
! #include "gc/parallel/psScavenge.hpp"
  
  inline size_t ParallelScavengeHeap::total_invocations()
  {
    return UseParallelOldGC ? PSParallelCompact::total_invocations() :
      PSMarkSweep::total_invocations();
*** 53,58 ****
    bool result = ((HeapWord*)p) >= young_gen()->reserved().start();
    assert(result == young_gen()->is_in_reserved(p),
          err_msg("incorrect test - result=%d, p=" PTR_FORMAT, result, p2i((void*)p)));
    return result;
  }
! #endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_INLINE_HPP
--- 53,58 ----
    bool result = ((HeapWord*)p) >= young_gen()->reserved().start();
    assert(result == young_gen()->is_in_reserved(p),
          err_msg("incorrect test - result=%d, p=" PTR_FORMAT, result, p2i((void*)p)));
    return result;
  }
! #endif // SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP