1.1 --- a/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp Fri Sep 27 13:41:07 2013 +0200 1.2 +++ b/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp Tue Sep 24 14:46:29 2013 +0200 1.3 @@ -41,11 +41,11 @@ 1.4 private: 1.5 G1CollectedHeap* _g1; 1.6 DirtyCardQueue *_dcq; 1.7 - CardTableModRefBS* _ct_bs; 1.8 + G1SATBCardTableModRefBS* _ct_bs; 1.9 1.10 public: 1.11 UpdateRSetDeferred(G1CollectedHeap* g1, DirtyCardQueue* dcq) : 1.12 - _g1(g1), _ct_bs((CardTableModRefBS*)_g1->barrier_set()), _dcq(dcq) {} 1.13 + _g1(g1), _ct_bs(_g1->g1_barrier_set()), _dcq(dcq) {} 1.14 1.15 virtual void do_oop(narrowOop* p) { do_oop_work(p); } 1.16 virtual void do_oop( oop* p) { do_oop_work(p); }