| Index: tools/clang/blink_gc_plugin/tests/legacy_naming/register_weak_members_template.h
|
| diff --git a/tools/clang/blink_gc_plugin/tests/legacy_naming/register_weak_members_template.h b/tools/clang/blink_gc_plugin/tests/legacy_naming/register_weak_members_template.h
|
| index 7d3905a51df2b02663e69f6f64777d3c0d5d2988..4df3adebdddefd509505faecf4529d8c52f179ee 100644
|
| --- a/tools/clang/blink_gc_plugin/tests/legacy_naming/register_weak_members_template.h
|
| +++ b/tools/clang/blink_gc_plugin/tests/legacy_naming/register_weak_members_template.h
|
| @@ -11,30 +11,20 @@ namespace blink {
|
|
|
| class X : public GarbageCollected<X> {
|
| public:
|
| - void trace(Visitor* visitor) { traceImpl(visitor); }
|
| - void trace(InlinedGlobalMarkingVisitor visitor) { traceImpl(visitor); }
|
| -
|
| - private:
|
| - template <typename VisitorDispatcher>
|
| - void traceImpl(VisitorDispatcher visitor) {}
|
| + void trace(Visitor*) {}
|
| };
|
|
|
| class HasUntracedWeakMembers : public GarbageCollected<HasUntracedWeakMembers> {
|
| public:
|
| - void trace(Visitor* visitor) { traceImpl(visitor); }
|
| - void trace(InlinedGlobalMarkingVisitor visitor) { traceImpl(visitor); }
|
| + void trace(Visitor* visitor) {
|
| + visitor->registerWeakMembers<HasUntracedWeakMembers,
|
| + &HasUntracedWeakMembers::clearWeakMembers>(
|
| + this);
|
| + }
|
|
|
| - // Don't have to be defined for the purpose of this test.
|
| void clearWeakMembers(Visitor* visitor);
|
|
|
| private:
|
| - template <typename VisitorDispatcher>
|
| - void traceImpl(VisitorDispatcher visitor) {
|
| - visitor->template registerWeakMembers<
|
| - HasUntracedWeakMembers,
|
| - &HasUntracedWeakMembers::clearWeakMembers>(this);
|
| - }
|
| -
|
| WeakMember<X> x_;
|
| };
|
|
|
|
|