--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp Wed Feb 13 15:50:08 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp Wed Feb 13 17:38:14 2019 -0500
@@ -25,11 +25,10 @@
#ifndef SHARE_GC_G1_G1BARRIERSET_HPP
#define SHARE_GC_G1_G1BARRIERSET_HPP
-#include "gc/g1/dirtyCardQueue.hpp"
+#include "gc/g1/g1DirtyCardQueue.hpp"
#include "gc/g1/g1SATBMarkQueueSet.hpp"
#include "gc/shared/cardTableBarrierSet.hpp"
-class DirtyCardQueueSet;
class CardTable;
class G1CardTable;
@@ -42,7 +41,7 @@
BufferNode::Allocator _satb_mark_queue_buffer_allocator;
BufferNode::Allocator _dirty_card_queue_buffer_allocator;
G1SATBMarkQueueSet _satb_mark_queue_set;
- DirtyCardQueueSet _dirty_card_queue_set;
+ G1DirtyCardQueueSet _dirty_card_queue_set;
static G1BarrierSet* g1_barrier_set() {
return barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
@@ -88,7 +87,7 @@
return g1_barrier_set()->_satb_mark_queue_set;
}
- static DirtyCardQueueSet& dirty_card_queue_set() {
+ static G1DirtyCardQueueSet& dirty_card_queue_set() {
return g1_barrier_set()->_dirty_card_queue_set;
}