Bug 412811 - "xpconnect-tools build broken" [p=armin76@gentoo.org (Raúl Porcel) r+sr=bsmedberg (NPODB)]
authorreed@reedloden.com
Fri, 18 Jan 2008 01:09:18 -0800
changeset 10387 f2bb82f234f9b96e60b3e212c3aa812fae80a7e2
parent 10386 e658c03654d10fca4068bfed31159633b79430b9
child 10388 d4cff0028ff1552ad40aa4f3645aec008a491bea
push idunknown
push userunknown
push dateunknown
bugs412811
milestone1.9b3pre
Bug 412811 - "xpconnect-tools build broken" [p=armin76@gentoo.org (Raúl Porcel) r+sr=bsmedberg (NPODB)]
js/src/xpconnect/sample/xpcsample1.cpp
js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp
--- a/js/src/xpconnect/sample/xpcsample1.cpp
+++ b/js/src/xpconnect/sample/xpcsample1.cpp
@@ -239,18 +239,18 @@ nsXPCSample_HookerUpper::CreateSampleObj
 
     // get the xpconnect service
     nsresult rv;
     nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID(), &rv));
     if(NS_FAILED(rv))
         return NS_ERROR_FAILURE;
 
     // get the xpconnect native call context
-    nsCOMPtr<nsIXPCNativeCallContext> callContext;
-    xpc->GetCurrentNativeCallContext(getter_AddRefs(callContext));
+    nsAXPCNativeCallContext *callContext = nsnull;
+    xpc->GetCurrentNativeCallContext(&callContext);
     if(!callContext)
         return NS_ERROR_FAILURE;
 
     // verify that we are being called from JS (i.e. the current call is
     // to this object - though we don't verify that it is to this exact method)
     nsCOMPtr<nsISupports> callee;
     callContext->GetCallee(getter_AddRefs(callee));
     if(!callee || callee.get() != (nsISupports*)this)
--- a/js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp
+++ b/js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp
@@ -88,18 +88,18 @@ NS_IMETHODIMP nsXPCToolsCompiler::Compil
     
     // get the xpconnect service
     nsresult rv;
     nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID(), &rv));
     if(NS_FAILED(rv))
         return NS_ERROR_FAILURE;
 
     // get the xpconnect native call context
-    nsCOMPtr<nsIXPCNativeCallContext> callContext;
-    xpc->GetCurrentNativeCallContext(getter_AddRefs(callContext));
+    nsAXPCNativeCallContext *callContext = nsnull;
+    xpc->GetCurrentNativeCallContext(&callContext);
     if(!callContext)
         return NS_ERROR_FAILURE;
 
     // verify that we are being called from JS (i.e. the current call is
     // to this object - though we don't verify that it is to this exact method)
     nsCOMPtr<nsISupports> callee;
     callContext->GetCallee(getter_AddRefs(callee));
     if(!callee || callee.get() != (nsISupports*)this)