Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert javaxpcom from using the (now-removed) XPTI_GetInterfaceInfoManager to use do_GetService, moa=jhpedemonte, from bug 315401

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@184419 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bsmedberg%covad.net
2005-11-10 20:09:22 +00:00
parent c74e76aaa6
commit 967b5d6ca4
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/extensions/java/xpcom/nsJavaWrapper.cpp
View File

@@ -44,6 +44,7 @@
#include "nsString.h"
#include "nsCRT.h"
#include "prmem.h"
#include "nsServiceManagerUtils.h"
#define JAVAPROXY_NATIVE(func) \
Java_org_mozilla_xpcom_internal_XPCOMJavaProxy_##func
@@ -109,9 +110,9 @@ CreateJavaArray(JNIEnv* env, PRUint8 aType, PRUint32 aSize, const nsID& aIID,
case nsXPTType::T_INTERFACE:
case nsXPTType::T_INTERFACE_IS:
{
nsCOMPtr<nsIInterfaceInfoManager> iim =
getter_AddRefs(XPTI_GetInterfaceInfoManager());
NS_ASSERTION(iim != nsnull, "Failed to get InterfaceInfoManager");
nsCOMPtr<nsIInterfaceInfoManager>
iim(do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID));
NS_ASSERTION(iim, "Failed to get InterfaceInfoManager");
if (!iim)
return NS_ERROR_FAILURE;
@@ -1618,9 +1619,9 @@ CreateJavaProxy(JNIEnv* env, nsISupports* aXPCOMObject, const nsIID& aIID,
if (!aResult)
return NS_ERROR_NULL_POINTER;
nsCOMPtr<nsIInterfaceInfoManager> iim =
getter_AddRefs(XPTI_GetInterfaceInfoManager());
NS_ASSERTION(iim != nsnull, "Failed to get InterfaceInfoManager");
nsCOMPtr<nsIInterfaceInfoManager>
iim(do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID));
NS_ASSERTION(iim, "Failed to get InterfaceInfoManager");
if (!iim)
return NS_ERROR_FAILURE;