Skip to content

Commit 3d0ab49

Browse files
committed
Add override keywords for clang-3.6
1 parent 536ed72 commit 3d0ab49

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

src/gc/collector.h

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,14 @@ void startGCUnexpectedRegion();
6868
void endGCUnexpectedRegion();
6969

7070
class GCVisitorNoRedundancy : public GCVisitor {
71-
virtual void _visitRedundant(void** ptr_address) { visit(ptr_address); }
72-
virtual void _visitRangeRedundant(void** start, void** end) { visitRange(start, end); }
71+
void _visitRedundant(void** ptr_address) override { visit(ptr_address); }
72+
void _visitRangeRedundant(void** start, void** end) override { visitRange(start, end); }
7373

7474
public:
7575
virtual ~GCVisitorNoRedundancy() {}
7676

77-
virtual void visitPotentialRedundant(void* p) { visitPotential(p); }
78-
virtual void visitPotentialRangeRedundant(void** start, void** end) { visitPotentialRange(start, end); }
79-
virtual bool shouldVisitRedundants() { return true; }
77+
void visitPotentialRedundant(void* p) override { visitPotential(p); }
78+
void visitPotentialRangeRedundant(void** start, void** end) override { visitPotentialRange(start, end); }
8079
};
8180

8281
//
@@ -85,18 +84,24 @@ class GCVisitorNoRedundancy : public GCVisitor {
8584

8685
class ReferenceMapStack;
8786

87+
#if MOVING_GC
88+
#define MOVING_OVERRIDE override
89+
#else
90+
#define MOVING_OVERRIDE
91+
#endif
92+
8893
// Bulds the reference map, and also determine which objects cannot be moved.
8994
class GCVisitorPinning : public GCVisitorNoRedundancy {
9095
private:
9196
ReferenceMapStack* stack;
9297

93-
virtual void _visit(void** ptr_address);
98+
void _visit(void** ptr_address) MOVING_OVERRIDE;
9499

95100
public:
96101
GCVisitorPinning(ReferenceMapStack* stack) : stack(stack) {}
97102
virtual ~GCVisitorPinning() {}
98103

99-
virtual void visitPotential(void* p);
104+
void visitPotential(void* p) MOVING_OVERRIDE;
100105
};
101106

102107
// Visits the fields and replaces it with new_values if it was equal to old_value.
@@ -105,14 +110,14 @@ class GCVisitorReplacing : public GCVisitor {
105110
void* old_value;
106111
void* new_value;
107112

108-
virtual void _visit(void** p);
113+
void _visit(void** p) MOVING_OVERRIDE;
109114

110115
public:
111116
GCVisitorReplacing(void* old_value, void* new_value) : old_value(old_value), new_value(new_value) {}
112117
virtual ~GCVisitorReplacing() {}
113118

114-
virtual void visitPotential(void* p){};
115-
virtual void visitPotentialRange(void** start, void** end){};
119+
void visitPotential(void* p) MOVING_OVERRIDE{};
120+
void visitPotentialRange(void** start, void** end) MOVING_OVERRIDE{};
116121
};
117122

118123
class GCAllocation;

0 commit comments

Comments
 (0)