src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp

*** 38,50 ****
  #include "gc_implementation/g1/g1YCTypes.hpp"
  #include "gc_implementation/g1/heapRegionManager.hpp"
  #include "gc_implementation/g1/heapRegionSet.hpp"
  #include "gc_implementation/shared/hSpaceCounters.hpp"
  #include "gc_implementation/shared/parGCAllocBuffer.hpp"
  #include "memory/barrierSet.hpp"
  #include "memory/memRegion.hpp"
- #include "memory/sharedHeap.hpp"
  #include "utilities/stack.hpp"
  
  // A "G1CollectedHeap" is an implementation of a java heap for HotSpot.
  // It uses the "Garbage First" heap organization and algorithm, which
  // may combine concurrent marking with parallel, incremental compaction of
--- 38,50 ----
  #include "gc_implementation/g1/g1YCTypes.hpp"
  #include "gc_implementation/g1/heapRegionManager.hpp"
  #include "gc_implementation/g1/heapRegionSet.hpp"
  #include "gc_implementation/shared/hSpaceCounters.hpp"
  #include "gc_implementation/shared/parGCAllocBuffer.hpp"
+ #include "gc_interface/collectedHeap.hpp"
  #include "memory/barrierSet.hpp"
  #include "memory/memRegion.hpp"
  #include "utilities/stack.hpp"
  
  // A "G1CollectedHeap" is an implementation of a java heap for HotSpot.
  // It uses the "Garbage First" heap organization and algorithm, which
  // may combine concurrent marking with parallel, incremental compaction of
*** 176,186 ****
    void reset_from_card_cache(uint start_idx, size_t num_regions);
   public:
    virtual void on_commit(uint start_idx, size_t num_regions, bool zero_filled);
  };
  
! class G1CollectedHeap : public SharedHeap {
    friend class VM_CollectForMetadataAllocation;
    friend class VM_G1CollectForAllocation;
    friend class VM_G1CollectFull;
    friend class VM_G1IncCollectionPause;
    friend class VMStructs;
--- 176,186 ----
    void reset_from_card_cache(uint start_idx, size_t num_regions);
   public:
    virtual void on_commit(uint start_idx, size_t num_regions, bool zero_filled);
  };
  
! class G1CollectedHeap : public CollectedHeap {
    friend class VM_CollectForMetadataAllocation;
    friend class VM_G1CollectForAllocation;
    friend class VM_G1CollectFull;
    friend class VM_G1IncCollectionPause;
    friend class VMStructs;
*** 1009,1019 ****
  
    // Initialize weak reference processing.
    void ref_processing_init();
  
    // Explicitly import set_par_threads into this scope
!   using SharedHeap::set_par_threads;
    // Set _n_par_threads according to a policy TBD.
    void set_par_threads();
  
    virtual Name kind() const {
      return CollectedHeap::G1CollectedHeap;
--- 1009,1019 ----
  
    // Initialize weak reference processing.
    void ref_processing_init();
  
    // Explicitly import set_par_threads into this scope
!   using CollectedHeap::set_par_threads;
    // Set _n_par_threads according to a policy TBD.
    void set_par_threads();
  
    virtual Name kind() const {
      return CollectedHeap::G1CollectedHeap;