From 30a06ffbf30d34226d64240ce5f5436faa257575 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Wed, 16 Jan 2013 23:36:02 -0500 Subject: [PATCH] bug 834894 - remove NS_IMPL_CYCLE_COLLECTION_NATIVE_x macros r=mccr8 --- accessible/src/base/AccEvent.cpp | 2 +- xpcom/glue/nsCycleCollectionParticipant.h | 33 ----------------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/accessible/src/base/AccEvent.cpp b/accessible/src/base/AccEvent.cpp index d5ee051153e..38207b348d0 100644 --- a/accessible/src/base/AccEvent.cpp +++ b/accessible/src/base/AccEvent.cpp @@ -53,7 +53,7 @@ AccEvent::CreateXPCOMObject() //////////////////////////////////////////////////////////////////////////////// // AccEvent cycle collection -NS_IMPL_CYCLE_COLLECTION_NATIVE_1(AccEvent, mAccessible) +NS_IMPL_CYCLE_COLLECTION_1(AccEvent, mAccessible) NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(AccEvent, AddRef) NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(AccEvent, Release) diff --git a/xpcom/glue/nsCycleCollectionParticipant.h b/xpcom/glue/nsCycleCollectionParticipant.h index 97e704c2896..e24f6cfa93d 100644 --- a/xpcom/glue/nsCycleCollectionParticipant.h +++ b/xpcom/glue/nsCycleCollectionParticipant.h @@ -1069,39 +1069,6 @@ struct Skippable NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_f8) \ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -// NS_IMPL_CYCLE_COLLECTION_NATIVE_0 is intentionally not defined, because -// if you need it, something is probably wrong. - -#define NS_IMPL_CYCLE_COLLECTION_NATIVE_1(_class, _f) \ - NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(_class) \ - NS_IMPL_CYCLE_COLLECTION_UNLINK(_f) \ - NS_IMPL_CYCLE_COLLECTION_UNLINK_END \ - NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(_class) \ - NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_f) \ - NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END - -#define NS_IMPL_CYCLE_COLLECTION_NATIVE_2(_class, _f1, _f2) \ - NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(_class) \ - NS_IMPL_CYCLE_COLLECTION_UNLINK(_f1) \ - NS_IMPL_CYCLE_COLLECTION_UNLINK(_f2) \ - NS_IMPL_CYCLE_COLLECTION_UNLINK_END \ - NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(_class) \ - NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_f1) \ - NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_f2) \ - NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END - -#define NS_IMPL_CYCLE_COLLECTION_NATIVE_3(_class, _f1, _f2, _f3) \ - NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(_class) \ - NS_IMPL_CYCLE_COLLECTION_UNLINK(_f1) \ - NS_IMPL_CYCLE_COLLECTION_UNLINK(_f2) \ - NS_IMPL_CYCLE_COLLECTION_UNLINK(_f3) \ - NS_IMPL_CYCLE_COLLECTION_UNLINK_END \ - NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(_class) \ - NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_f1) \ - NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_f2) \ - NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_f3) \ - NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END - #define NS_CYCLE_COLLECTION_NOTE_EDGE_NAME CycleCollectionNoteEdgeName #endif // nsCycleCollectionParticipant_h__