Took out redundant MOZ_COUNT_CTOR/DTOR calls.

content/xul/content/src/nsRDFDOMNodeList.cpp

@@ -54,14 +54,11 @@ nsRDFDOMNodeList::nsRDFDOMNodeList(void)
       mElements(nsnull),
       mScriptObject(nsnull)
 {
-    MOZ_COUNT_CTOR(RDF_nsRDFDOMNodeList);
-
     NS_INIT_REFCNT();
 }
 
 nsRDFDOMNodeList::~nsRDFDOMNodeList(void)
 {
-    MOZ_COUNT_DTOR(RDF_nsRDFDOMNodeList);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: nsRDFDOMNodeList\n", gInstanceCount);

content/xul/content/src/nsXULPopupListener.cpp

@@ -121,8 +121,6 @@ XULPopupListenerImpl::XULPopupListenerImpl(void)
     mMouseClientX(0), mMouseClientY(0),
     mPossibleTooltipNode(nsnull)
 {
-	MOZ_COUNT_CTOR(RDF_XULPopupListenerImpl);
-
 	NS_INIT_REFCNT();	
 }
 
@@ -131,7 +129,6 @@ XULPopupListenerImpl::~XULPopupListenerImpl(void)
   //XXX do we need to close the popup here? Will we get the right events as
   //XXX the topLevel window is going away when the closebox is pressed?
 
-    MOZ_COUNT_DTOR(RDF_XULPopupListenerImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: XULPopupListenerImpl\n", gInstanceCount);

content/xul/content/src/nsXULTreeElement.cpp

@@ -64,8 +64,6 @@ nsXULTreeElement::QueryInterface(REFNSIID aIID, void** aResult)
 nsXULTreeElement::nsXULTreeElement(nsIDOMXULElement* aOuter)
 :nsXULElement(aOuter)
 {
-    MOZ_COUNT_CTOR(RDF_nsXULTreeElement);
-
   if (gRefCnt++ == 0) {
     kSelectedAtom    = NS_NewAtom("selected");
   }
@@ -89,7 +87,6 @@ nsXULTreeElement::nsXULTreeElement(nsIDOMXULElement* aOuter)
 
 nsXULTreeElement::~nsXULTreeElement()
 {
-    MOZ_COUNT_DTOR(RDF_nsXULTreeElement);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: nsXULTreeElement\n", gInstanceCount);

content/xul/document/src/nsXULContentSink.cpp

@@ -473,8 +473,6 @@ XULContentSinkImpl::XULContentSinkImpl(nsresult& rv)
       mCurrentOverlay(0),
       mStyleSheetCount(0)
 {
-    MOZ_COUNT_CTOR(RDF_XULContentSinkImpl);
-
     NS_INIT_REFCNT();
 
     if (gRefCnt++ == 0) {
@@ -534,7 +532,6 @@ XULContentSinkImpl::XULContentSinkImpl(nsresult& rv)
 
 XULContentSinkImpl::~XULContentSinkImpl()
 {
-    MOZ_COUNT_DTOR(RDF_XULContentSinkImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: XULContentSinkImpl\n", gInstanceCount);

content/xul/document/src/nsXULDocument.cpp

@@ -662,13 +662,11 @@ XULDocumentImpl::XULDocumentImpl(void)
       mIsPopup(PR_FALSE),
       mForwardReferencesResolved(PR_FALSE)
 {
-    MOZ_COUNT_CTOR(RDF_XULDocumentImpl);
     NS_INIT_REFCNT();
 }
 
 XULDocumentImpl::~XULDocumentImpl()
 {
-    MOZ_COUNT_DTOR(RDF_XULDocumentImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: XULDocumentImpl\n", gInstanceCount);

content/xul/templates/src/nsXULContentUtils.cpp

@@ -166,8 +166,6 @@ nsIAtom* nsXULContentUtils::kTargetsAtom;
 
 nsXULContentUtils::nsXULContentUtils()
 {
-    MOZ_COUNT_CTOR(RDF_nsXULContentUtils);
-
     NS_INIT_REFCNT();
 }
 
@@ -203,7 +201,6 @@ nsXULContentUtils::Init()
 
 nsXULContentUtils::~nsXULContentUtils()
 {
-    MOZ_COUNT_DTOR(RDF_nsXULContentUtils);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: nsXULContentUtils\n", gInstanceCount);

content/xul/templates/src/nsXULSortService.cpp

@@ -259,8 +259,6 @@ PRInt32  XULSortServiceImpl::kNameSpaceID_RDF;
 
 XULSortServiceImpl::XULSortServiceImpl(void)
 {
-	MOZ_COUNT_CTOR(RDF_XULSortServiceImpl);
-
 	NS_INIT_REFCNT();
 	if (gRefCnt == 0)
 	{
@@ -360,7 +358,6 @@ XULSortServiceImpl::XULSortServiceImpl(void)
 
 XULSortServiceImpl::~XULSortServiceImpl(void)
 {
-    MOZ_COUNT_DTOR(RDF_XULSortServiceImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: XULSortServiceImpl\n", gInstanceCount);

content/xul/templates/src/nsXULTemplateBuilder.cpp

@@ -426,13 +426,11 @@ RDFGenericBuilderImpl::RDFGenericBuilderImpl(void)
       mRoot(nsnull),
       mTimer(nsnull)
 {
-    MOZ_COUNT_CTOR(RDF_RDFGenericBuilderImpl);
     NS_INIT_REFCNT();
 }
 
 RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void)
 {
-  MOZ_COUNT_DTOR(RDF_RDFGenericBuilderImpl);
 #ifdef DEBUG_REFS
   --gInstanceCount;
   fprintf(stdout, "%d - RDF: RDFGenericBuilderImpl\n", gInstanceCount);

rdf/base/src/nsCompositeDataSource.cpp

@@ -147,7 +147,6 @@ CompositeEnumeratorImpl::CompositeEnumeratorImpl(CompositeDataSourceImpl* aCompo
       mAllowNegativeAssertions(aAllowNegativeAssertions),
       mCoalesceDuplicateArcs(aCoalesceDuplicateArcs)
 {
-	MOZ_COUNT_CTOR(RDF_CompositeEnumeratorImpl);
 	NS_INIT_REFCNT();
 	NS_ADDREF(mCompositeDataSource);
 }
@@ -155,7 +154,6 @@ CompositeEnumeratorImpl::CompositeEnumeratorImpl(CompositeDataSourceImpl* aCompo
 
 CompositeEnumeratorImpl::~CompositeEnumeratorImpl(void)
 {
-	MOZ_COUNT_DTOR(RDF_CompositeEnumeratorImpl);
 #ifdef DEBUG_REFS
 	--gInstanceCount;
 	fprintf(stdout, "%d - RDF: CompositeEnumeratorImpl\n", gInstanceCount);
@@ -384,13 +382,11 @@ CompositeArcsInOutEnumeratorImpl::CompositeArcsInOutEnumeratorImpl(
       mAllowNegativeAssertions(aAllowNegativeAssertions),
       mCoalesceDuplicateArcs(aCoalesceDuplicateArcs)
 {
-    MOZ_COUNT_CTOR(RDF_CompositeArcsInOutEnumeratorImpl);
     NS_ADDREF(mNode);
 }
 
 CompositeArcsInOutEnumeratorImpl::~CompositeArcsInOutEnumeratorImpl()
 {
-    MOZ_COUNT_DTOR(RDF_CompositeArcsInOutEnumeratorImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: CompositeArcsInOutEnumeratorImpl\n", gInstanceCount);
@@ -475,8 +471,6 @@ CompositeAssertionEnumeratorImpl::CompositeAssertionEnumeratorImpl(
       mAllowNegativeAssertions(aAllowNegativeAssertions),
       mCoalesceDuplicateArcs(aCoalesceDuplicateArcs)
 {
-    MOZ_COUNT_CTOR(RDF_CompositeAssertionEnumeratorImpl);
-
     NS_IF_ADDREF(mSource);
     NS_ADDREF(mProperty); // always must be specified
     NS_IF_ADDREF(mTarget);
@@ -484,7 +478,6 @@ CompositeAssertionEnumeratorImpl::CompositeAssertionEnumeratorImpl(
 
 CompositeAssertionEnumeratorImpl::~CompositeAssertionEnumeratorImpl()
 {
-    MOZ_COUNT_DTOR(RDF_CompositeAssertionEnumeratorImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: CompositeAssertionEnumeratorImpl\n", gInstanceCount);
@@ -544,8 +537,6 @@ CompositeDataSourceImpl::CompositeDataSourceImpl(void)
 	: mAllowNegativeAssertions(PR_TRUE),
 	  mCoalesceDuplicateArcs(PR_TRUE)
 {
-    MOZ_COUNT_CTOR(RDF_CompositeDataSourceImpl);
-
     NS_INIT_REFCNT();
 
 #ifdef PR_LOGGING
@@ -557,7 +548,6 @@ CompositeDataSourceImpl::CompositeDataSourceImpl(void)
 
 CompositeDataSourceImpl::~CompositeDataSourceImpl(void)
 {
-    MOZ_COUNT_DTOR(RDF_CompositeDataSourceImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: CompositeDataSourceImpl\n", gInstanceCount);

rdf/base/src/nsContainerEnumerator.cpp

@@ -88,8 +88,6 @@ ContainerEnumeratorImpl::ContainerEnumeratorImpl(nsIRDFDataSource* aDataSource,
       mResult(nsnull),
       mNextIndex(1)
 {
-    MOZ_COUNT_CTOR(RDF_ContainerEnumeratorImpl);
-
     NS_INIT_REFCNT();
 
     mDataSource = dont_QueryInterface(aDataSource);
@@ -110,7 +108,6 @@ ContainerEnumeratorImpl::ContainerEnumeratorImpl(nsIRDFDataSource* aDataSource,
 
 ContainerEnumeratorImpl::~ContainerEnumeratorImpl(void)
 {
-    MOZ_COUNT_DTOR(RDF_ContainerEnumeratorImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: ContainerEnumeratorImpl\n", gInstanceCount);

rdf/base/src/nsInMemoryDataSource.cpp

@@ -307,8 +307,6 @@ InMemoryAssertionEnumeratorImpl::InMemoryAssertionEnumeratorImpl(
       mTruthValue(aTruthValue),
       mNextAssertion(nsnull)
 {
-    MOZ_COUNT_CTOR(RDF_InMemoryAssertionEnumeratorImpl);
-
     NS_INIT_REFCNT();
 
     NS_ADDREF(mDataSource);
@@ -326,7 +324,6 @@ InMemoryAssertionEnumeratorImpl::InMemoryAssertionEnumeratorImpl(
 
 InMemoryAssertionEnumeratorImpl::~InMemoryAssertionEnumeratorImpl()
 {
-    MOZ_COUNT_DTOR(RDF_InMemoryAssertionEnumeratorImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: InMemoryAssertionEnumeratorImpl\n", gInstanceCount);
@@ -441,8 +438,6 @@ InMemoryArcsEnumeratorImpl::InMemoryArcsEnumeratorImpl(InMemoryDataSource* aData
       mTarget(aTarget),
       mCurrent(nsnull)
 {
-    MOZ_COUNT_CTOR(RDF_InMemoryArcsEnumeratorImpl);
-
     NS_INIT_REFCNT();
     NS_ADDREF(mDataSource);
     NS_IF_ADDREF(mSource);
@@ -459,7 +454,6 @@ InMemoryArcsEnumeratorImpl::InMemoryArcsEnumeratorImpl(InMemoryDataSource* aData
 
 InMemoryArcsEnumeratorImpl::~InMemoryArcsEnumeratorImpl()
 {
-    MOZ_COUNT_DTOR(RDF_InMemoryArcsEnumeratorImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: InMemoryArcsEnumeratorImpl\n", gInstanceCount);
@@ -584,8 +578,6 @@ InMemoryDataSource::InMemoryDataSource(nsISupports* aOuter)
       mReverseArcs(nsnull),
       mLock(nsnull)
 {
-    MOZ_COUNT_CTOR(RDF_InMemoryDataSource);
-
     NS_INIT_AGGREGATED(aOuter);
 }
 
@@ -628,7 +620,6 @@ InMemoryDataSource::Init()
 
 InMemoryDataSource::~InMemoryDataSource()
 {
-    MOZ_COUNT_DTOR(RDF_InMemoryDataSource);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: InMemoryDataSource\n", gInstanceCount);

rdf/base/src/nsRDFContainer.cpp

@@ -429,8 +429,6 @@ RDFContainerImpl::IndexOf(nsIRDFNode *aElement, PRInt32 *aIndex)
 RDFContainerImpl::RDFContainerImpl()
     : mDataSource(nsnull), mContainer(nsnull)
 {
-    MOZ_COUNT_CTOR(RDF_RDFContainerImpl);
-
     NS_INIT_REFCNT();
 
     if (gRefCnt++ == 0) {
@@ -456,7 +454,6 @@ RDFContainerImpl::RDFContainerImpl()
 
 RDFContainerImpl::~RDFContainerImpl()
 {
-    MOZ_COUNT_DTOR(RDF_RDFContainerImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: RDFContainerImpl\n", gInstanceCount);

rdf/base/src/nsRDFContainerUtils.cpp

@@ -311,8 +311,6 @@ RDFContainerUtilsImpl::MakeAlt(nsIRDFDataSource *aDataSource, nsIRDFResource *aR
 
 RDFContainerUtilsImpl::RDFContainerUtilsImpl()
 {
-    MOZ_COUNT_CTOR(RDF_RDFContainerUtilsImpl);
-
     NS_INIT_REFCNT();
 
     if (gRefCnt++ == 0) {
@@ -336,7 +334,6 @@ RDFContainerUtilsImpl::RDFContainerUtilsImpl()
 
 RDFContainerUtilsImpl::~RDFContainerUtilsImpl()
 {
-    MOZ_COUNT_DTOR(RDF_RDFContainerUtilsImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: RDFContainerUtilsImpl\n", gInstanceCount);

rdf/base/src/nsRDFContentSink.cpp

@@ -301,8 +301,6 @@ RDFContentSinkImpl::RDFContentSinkImpl()
       mDocumentURL(nsnull),
       mGenSym(0)
 {
-    MOZ_COUNT_CTOR(RDF_RDFContentSinkImpl);
-
     NS_INIT_REFCNT();
 
     if (gRefCnt++ == 0) {
@@ -347,7 +345,6 @@ RDFContentSinkImpl::RDFContentSinkImpl()
 
 RDFContentSinkImpl::~RDFContentSinkImpl()
 {
-    MOZ_COUNT_DTOR(RDF_RDFContentSinkImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: RDFContentSinkImpl\n", gInstanceCount);

rdf/base/src/nsRDFXMLDataSource.cpp

@@ -420,8 +420,6 @@ RDFXMLDataSourceImpl::RDFXMLDataSourceImpl(void)
       mNameSpaces(nsnull),
       mURLSpec(nsnull)
 {
-    MOZ_COUNT_CTOR(RDF_RDFXMLDataSourceImpl);
-
     NS_INIT_REFCNT();
 
 #ifdef PR_LOGGING
@@ -480,7 +478,6 @@ RDFXMLDataSourceImpl::Init()
 
 RDFXMLDataSourceImpl::~RDFXMLDataSourceImpl(void)
 {
-    MOZ_COUNT_DTOR(RDF_RDFXMLDataSourceImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: RDFXMLDataSourceImpl\n", gInstanceCount);

rdf/content/src/nsRDFDOMNodeList.cpp

@@ -54,14 +54,11 @@ nsRDFDOMNodeList::nsRDFDOMNodeList(void)
       mElements(nsnull),
       mScriptObject(nsnull)
 {
-    MOZ_COUNT_CTOR(RDF_nsRDFDOMNodeList);
-
     NS_INIT_REFCNT();
 }
 
 nsRDFDOMNodeList::~nsRDFDOMNodeList(void)
 {
-    MOZ_COUNT_DTOR(RDF_nsRDFDOMNodeList);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: nsRDFDOMNodeList\n", gInstanceCount);

rdf/content/src/nsRDFGenericBuilder.cpp

@@ -426,13 +426,11 @@ RDFGenericBuilderImpl::RDFGenericBuilderImpl(void)
       mRoot(nsnull),
       mTimer(nsnull)
 {
-    MOZ_COUNT_CTOR(RDF_RDFGenericBuilderImpl);
     NS_INIT_REFCNT();
 }
 
 RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void)
 {
-  MOZ_COUNT_DTOR(RDF_RDFGenericBuilderImpl);
 #ifdef DEBUG_REFS
   --gInstanceCount;
   fprintf(stdout, "%d - RDF: RDFGenericBuilderImpl\n", gInstanceCount);

rdf/content/src/nsXULContentSink.cpp

@@ -473,8 +473,6 @@ XULContentSinkImpl::XULContentSinkImpl(nsresult& rv)
       mCurrentOverlay(0),
       mStyleSheetCount(0)
 {
-    MOZ_COUNT_CTOR(RDF_XULContentSinkImpl);
-
     NS_INIT_REFCNT();
 
     if (gRefCnt++ == 0) {
@@ -534,7 +532,6 @@ XULContentSinkImpl::XULContentSinkImpl(nsresult& rv)
 
 XULContentSinkImpl::~XULContentSinkImpl()
 {
-    MOZ_COUNT_DTOR(RDF_XULContentSinkImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: XULContentSinkImpl\n", gInstanceCount);

rdf/content/src/nsXULContentUtils.cpp

@@ -166,8 +166,6 @@ nsIAtom* nsXULContentUtils::kTargetsAtom;
 
 nsXULContentUtils::nsXULContentUtils()
 {
-    MOZ_COUNT_CTOR(RDF_nsXULContentUtils);
-
     NS_INIT_REFCNT();
 }
 
@@ -203,7 +201,6 @@ nsXULContentUtils::Init()
 
 nsXULContentUtils::~nsXULContentUtils()
 {
-    MOZ_COUNT_DTOR(RDF_nsXULContentUtils);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: nsXULContentUtils\n", gInstanceCount);

rdf/content/src/nsXULDocument.cpp

@@ -662,13 +662,11 @@ XULDocumentImpl::XULDocumentImpl(void)
       mIsPopup(PR_FALSE),
       mForwardReferencesResolved(PR_FALSE)
 {
-    MOZ_COUNT_CTOR(RDF_XULDocumentImpl);
     NS_INIT_REFCNT();
 }
 
 XULDocumentImpl::~XULDocumentImpl()
 {
-    MOZ_COUNT_DTOR(RDF_XULDocumentImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: XULDocumentImpl\n", gInstanceCount);

rdf/content/src/nsXULDocumentInfo.cpp

@@ -64,15 +64,12 @@ private:
 XULDocumentInfoImpl::XULDocumentInfoImpl(void)
 :mParentDocument(nsnull), mContentSink(nsnull)
 {
-	MOZ_COUNT_CTOR(RDF_XULDocumentInfoImpl);
-
 	NS_INIT_REFCNT();
 }
 
 
 XULDocumentInfoImpl::~XULDocumentInfoImpl(void)
 {
-    MOZ_COUNT_DTOR(RDF_XULDocumentInfoImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: XULDocumentInfoImpl\n", gInstanceCount);

rdf/content/src/nsXULEditorElement.cpp

@@ -60,12 +60,10 @@ MOZ_DECL_CTOR_COUNTER(RDF_nsXULEditorElement);
 nsXULEditorElement::nsXULEditorElement(nsIDOMXULElement* aOuter)
 :nsXULElement(aOuter)
 {
-    MOZ_COUNT_CTOR(RDF_nsXULEditorElement);
 }
 
 nsXULEditorElement::~nsXULEditorElement()
 {
-    MOZ_COUNT_DTOR(RDF_nsXULEditorElement);
 }
 
 NS_IMETHODIMP

rdf/content/src/nsXULKeyListener.cpp

@@ -230,14 +230,11 @@ private:
 
 nsXULKeyListenerImpl::nsXULKeyListenerImpl(void)
 {
-	MOZ_COUNT_CTOR(RDF_nsXULKeyListenerImpl);
-
 	NS_INIT_REFCNT();	
 }
 
 nsXULKeyListenerImpl::~nsXULKeyListenerImpl(void)
 {
-    MOZ_COUNT_DTOR(RDF_nsXULKeyListenerImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: nsXULKeyListenerImpl\n", gInstanceCount);

rdf/content/src/nsXULPopupListener.cpp

@@ -121,8 +121,6 @@ XULPopupListenerImpl::XULPopupListenerImpl(void)
     mMouseClientX(0), mMouseClientY(0),
     mPossibleTooltipNode(nsnull)
 {
-	MOZ_COUNT_CTOR(RDF_XULPopupListenerImpl);
-
 	NS_INIT_REFCNT();	
 }
 
@@ -131,7 +129,6 @@ XULPopupListenerImpl::~XULPopupListenerImpl(void)
   //XXX do we need to close the popup here? Will we get the right events as
   //XXX the topLevel window is going away when the closebox is pressed?
 
-    MOZ_COUNT_DTOR(RDF_XULPopupListenerImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: XULPopupListenerImpl\n", gInstanceCount);

rdf/content/src/nsXULSortService.cpp

@@ -259,8 +259,6 @@ PRInt32  XULSortServiceImpl::kNameSpaceID_RDF;
 
 XULSortServiceImpl::XULSortServiceImpl(void)
 {
-	MOZ_COUNT_CTOR(RDF_XULSortServiceImpl);
-
 	NS_INIT_REFCNT();
 	if (gRefCnt == 0)
 	{
@@ -360,7 +358,6 @@ XULSortServiceImpl::XULSortServiceImpl(void)
 
 XULSortServiceImpl::~XULSortServiceImpl(void)
 {
-    MOZ_COUNT_DTOR(RDF_XULSortServiceImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: XULSortServiceImpl\n", gInstanceCount);

rdf/content/src/nsXULTemplateBuilder.cpp

@@ -426,13 +426,11 @@ RDFGenericBuilderImpl::RDFGenericBuilderImpl(void)
       mRoot(nsnull),
       mTimer(nsnull)
 {
-    MOZ_COUNT_CTOR(RDF_RDFGenericBuilderImpl);
     NS_INIT_REFCNT();
 }
 
 RDFGenericBuilderImpl::~RDFGenericBuilderImpl(void)
 {
-  MOZ_COUNT_DTOR(RDF_RDFGenericBuilderImpl);
 #ifdef DEBUG_REFS
   --gInstanceCount;
   fprintf(stdout, "%d - RDF: RDFGenericBuilderImpl\n", gInstanceCount);

rdf/content/src/nsXULTreeElement.cpp

@@ -64,8 +64,6 @@ nsXULTreeElement::QueryInterface(REFNSIID aIID, void** aResult)
 nsXULTreeElement::nsXULTreeElement(nsIDOMXULElement* aOuter)
 :nsXULElement(aOuter)
 {
-    MOZ_COUNT_CTOR(RDF_nsXULTreeElement);
-
   if (gRefCnt++ == 0) {
     kSelectedAtom    = NS_NewAtom("selected");
   }
@@ -89,7 +87,6 @@ nsXULTreeElement::nsXULTreeElement(nsIDOMXULElement* aOuter)
 
 nsXULTreeElement::~nsXULTreeElement()
 {
-    MOZ_COUNT_DTOR(RDF_nsXULTreeElement);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: nsXULTreeElement\n", gInstanceCount);

rdf/datasource/src/nsFileSystemDataSource.cpp

@@ -234,8 +234,6 @@ FileSystemDataSource::isFileURI(nsIRDFResource *r)
 
 FileSystemDataSource::FileSystemDataSource(void)
 {
-	MOZ_COUNT_CTOR(RDF_FileSystemDataSource);
-
 	NS_INIT_REFCNT();
 
 	if (gRefCnt++ == 0)
@@ -275,7 +273,6 @@ FileSystemDataSource::FileSystemDataSource(void)
 
 FileSystemDataSource::~FileSystemDataSource (void)
 {
-    MOZ_COUNT_DTOR(RDF_FileSystemDataSource);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: FileSystemDataSource\n", gInstanceCount);

rdf/datasource/src/nsLocalStore.cpp

@@ -194,14 +194,11 @@ public:
 
 LocalStoreImpl::LocalStoreImpl(void)
 {
-    MOZ_COUNT_CTOR(RDF_LocalStoreImpl);
-
     NS_INIT_ISUPPORTS();
 }
 
 LocalStoreImpl::~LocalStoreImpl(void)
 {
-    MOZ_COUNT_DTOR(RDF_LocalStoreImpl);
 #ifdef DEBUG_REFS
     --gInstanceCount;
     fprintf(stdout, "%d - RDF: LocalStoreImpl\n", gInstanceCount);