src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp

8199604_cardtablemodrefbs_rename

*** 28,38 ****
  #include "gc/parallel/generationSizer.hpp"
  #include "gc/parallel/objectStartArray.hpp"
  #include "gc/parallel/psGCAdaptivePolicyCounters.hpp"
  #include "gc/parallel/psOldGen.hpp"
  #include "gc/parallel/psYoungGen.hpp"
! #include "gc/shared/cardTableModRefBS.hpp"
  #include "gc/shared/collectedHeap.hpp"
  #include "gc/shared/collectorPolicy.hpp"
  #include "gc/shared/gcPolicyCounters.hpp"
  #include "gc/shared/gcWhen.hpp"
  #include "gc/shared/softRefPolicy.hpp"
--- 28,38 ----
  #include "gc/parallel/generationSizer.hpp"
  #include "gc/parallel/objectStartArray.hpp"
  #include "gc/parallel/psGCAdaptivePolicyCounters.hpp"
  #include "gc/parallel/psOldGen.hpp"
  #include "gc/parallel/psYoungGen.hpp"
! #include "gc/shared/cardTableBarrierSet.hpp"
  #include "gc/shared/collectedHeap.hpp"
  #include "gc/shared/collectorPolicy.hpp"
  #include "gc/shared/gcPolicyCounters.hpp"
  #include "gc/shared/gcWhen.hpp"
  #include "gc/shared/softRefPolicy.hpp"
***************
*** 125,135 ****
  
    static ParallelScavengeHeap* heap();
  
    static GCTaskManager* const gc_task_manager() { return _gc_task_manager; }
  
!   CardTableModRefBS* barrier_set();
    PSCardTable* card_table();
  
    AdjoiningGenerations* gens() { return _gens; }
  
    // Returns JNI_OK on success
--- 125,135 ----
  
    static ParallelScavengeHeap* heap();
  
    static GCTaskManager* const gc_task_manager() { return _gc_task_manager; }
  
!   CardTableBarrierSet* barrier_set();
    PSCardTable* card_table();
  
    AdjoiningGenerations* gens() { return _gens; }
  
    // Returns JNI_OK on success