garburator-blacklist-xpcom
author Benjamin Smedberg <benjamin@smedbergs.us>
Sat, 26 Jul 2008 22:49:39 -0400
changeset 167 a4da40849f5436e629c5732f4368c6c48189637f
parent 80 07783adadb3b0f82cea9c4f71d2f410d3ccb5c17
permissions -rw-r--r--
State as of now

diff --git a/xpcom/ds/nsObserverList.cpp b/xpcom/ds/nsObserverList.cpp
--- a/xpcom/ds/nsObserverList.cpp
+++ b/xpcom/ds/nsObserverList.cpp
@@ -73,7 +73,7 @@ nsObserverList::RemoveObserver(nsIObserv
     if (mObservers.RemoveElement(static_cast<nsISupports*>(anObserver)))
         return NS_OK;
 
-    nsCOMPtr<nsIWeakReference> observerRef = do_GetWeakReference(anObserver);
+    nsIWeakReference* observerRef = do_GetWeakReference(anObserver);
     if (!observerRef)
         return NS_ERROR_FAILURE;
 
diff --git a/xpcom/tests/TestTArray.cpp b/xpcom/tests/TestTArray.cpp
--- a/xpcom/tests/TestTArray.cpp
+++ b/xpcom/tests/TestTArray.cpp
@@ -299,7 +299,7 @@ static PRBool test_string_array() {
 
 //----
 
-typedef nsCOMPtr<nsIFile> FilePointer;
+typedef nsIFile* FilePointer;
 
 class nsFileNameComparator {
   public:
@@ -311,8 +311,8 @@ class nsFileNameComparator {
 };
 
 static PRBool test_comptr_array() {
-  FilePointer tmpDir;
-  NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(tmpDir));
+  FilePointer tmpDir = nsnull;
+  NS_GetSpecialDirectory(NS_OS_TEMP_DIR, &tmpDir);
   if (!tmpDir)
     return PR_FALSE;
   const char *kNames[] = {
@@ -322,7 +322,7 @@ static PRBool test_comptr_array() {
   PRUint32 i;
   for (i = 0; i < NS_ARRAY_LENGTH(kNames); ++i) {
     FilePointer f;
-    tmpDir->Clone(getter_AddRefs(f));
+    tmpDir->Clone(&f);
     if (!f)
       return PR_FALSE;
     if (NS_FAILED(f->AppendNative(nsDependentCString(kNames[i]))))