src/hotspot/share/gc/g1/g1ParScanThreadState.hpp

G1BarrierSet_merge

*** 24,38 ****
  
  #ifndef SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP
  #define SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP
  
  #include "gc/g1/dirtyCardQueue.hpp"
  #include "gc/g1/g1CollectedHeap.hpp"
  #include "gc/g1/g1OopClosures.hpp"
  #include "gc/g1/g1Policy.hpp"
  #include "gc/g1/g1RemSet.hpp"
- #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc/shared/ageTable.hpp"
  #include "memory/allocation.hpp"
  #include "oops/oop.hpp"
  
  class G1PLABAllocator;
--- 24,38 ----
  
  #ifndef SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP
  #define SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP
  
  #include "gc/g1/dirtyCardQueue.hpp"
+ #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/g1CollectedHeap.hpp"
  #include "gc/g1/g1OopClosures.hpp"
  #include "gc/g1/g1Policy.hpp"
  #include "gc/g1/g1RemSet.hpp"
  #include "gc/shared/ageTable.hpp"
  #include "memory/allocation.hpp"
  #include "oops/oop.hpp"
  
  class G1PLABAllocator;