diff --git a/mozilla/rdf/datasource/src/nsBookmarkDataSource.cpp b/mozilla/rdf/datasource/src/nsBookmarkDataSource.cpp index 6d01a4fa518..ef6e6ad8b2a 100644 --- a/mozilla/rdf/datasource/src/nsBookmarkDataSource.cpp +++ b/mozilla/rdf/datasource/src/nsBookmarkDataSource.cpp @@ -814,19 +814,13 @@ HT_WriteOutAsBookmarks1 (RDF rdf, PRFileDesc *fp, RDF_Resource u, RDF_Resource t #include "nsXPComFactory.h" -#if defined(TEMPLATES_IN_nsXPComFactory_EXORCISM) NS_DEF_FACTORY(BookmarkDataSource,BookmarkDataSourceImpl) -#endif nsresult NS_NewRDFBookmarkDataSourceFactory(nsIFactory** aResult) { nsresult rv = NS_OK; -#if defined(TEMPLATES_IN_nsXPComFactory_EXORCISM) nsIFactory* inst = new nsBookmarkDataSourceFactory; -#else - nsIFactory* inst = new nsFactory(); -#endif if (NULL == inst) { rv = NS_ERROR_OUT_OF_MEMORY; } else { diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp index 2d012652833..ac94b8765b3 100644 --- a/mozilla/uriloader/base/nsDocLoader.cpp +++ b/mozilla/uriloader/base/nsDocLoader.cpp @@ -1777,7 +1777,6 @@ nsDocumentBindInfo::CancelRefreshURLTimers(void) *******************************************/ static nsDocLoaderImpl* gServiceInstance = nsnull; -#if defined(TEMPLATES_IN_nsXPComFactory_EXORCISM) NS_DEF_FACTORY(DocLoaderServiceGen,nsDocLoaderImpl) class nsDocLoaderServiceFactory : public nsDocLoaderServiceGenFactory @@ -1787,15 +1786,6 @@ public: const nsIID &aIID, void **aResult); }; -#else -class nsDocLoaderServiceFactory : public nsFactory -{ -public: - NS_IMETHOD CreateInstance(nsISupports *aOuter, - const nsIID &aIID, - void **aResult); -}; -#endif NS_IMETHODIMP nsDocLoaderServiceFactory::CreateInstance(nsISupports *aOuter, diff --git a/mozilla/webshell/src/nsDocLoader.cpp b/mozilla/webshell/src/nsDocLoader.cpp index 2d012652833..ac94b8765b3 100644 --- a/mozilla/webshell/src/nsDocLoader.cpp +++ b/mozilla/webshell/src/nsDocLoader.cpp @@ -1777,7 +1777,6 @@ nsDocumentBindInfo::CancelRefreshURLTimers(void) *******************************************/ static nsDocLoaderImpl* gServiceInstance = nsnull; -#if defined(TEMPLATES_IN_nsXPComFactory_EXORCISM) NS_DEF_FACTORY(DocLoaderServiceGen,nsDocLoaderImpl) class nsDocLoaderServiceFactory : public nsDocLoaderServiceGenFactory @@ -1787,15 +1786,6 @@ public: const nsIID &aIID, void **aResult); }; -#else -class nsDocLoaderServiceFactory : public nsFactory -{ -public: - NS_IMETHOD CreateInstance(nsISupports *aOuter, - const nsIID &aIID, - void **aResult); -}; -#endif NS_IMETHODIMP nsDocLoaderServiceFactory::CreateInstance(nsISupports *aOuter, diff --git a/mozilla/xpcom/components/nsXPComFactory.h b/mozilla/xpcom/components/nsXPComFactory.h index b9763150235..6f2e4ab9c33 100644 --- a/mozilla/xpcom/components/nsXPComFactory.h +++ b/mozilla/xpcom/components/nsXPComFactory.h @@ -22,15 +22,6 @@ #include "nsIFactory.h" -/* - * TEMPLATES_IN_nsXPComFactory_EXORCISM is a temporary hack until I can - * verify that this works on windows and mac. -re - */ -#if defined(XP_UNIX) -#define TEMPLATES_IN_nsXPComFactory_EXORCISM 1 -#endif - -#if defined(TEMPLATES_IN_nsXPComFactory_EXORCISM) /* * This file contains a macro for the implementation of a simple XPCOM factory. * @@ -74,223 +65,94 @@ * support aggregation. * */ -#define NS_DEF_FACTORY(_name,_type) \ -class ns##_name##Factory : public nsIFactory \ -{ \ -public: \ - ns##_name##Factory() { NS_INIT_REFCNT(); } \ - \ - NS_IMETHOD_(nsrefcnt) AddRef (void) \ - { \ - return ++mRefCnt; \ - } \ - \ - NS_IMETHOD_(nsrefcnt) Release(void) \ - { \ - NS_PRECONDITION(0 != mRefCnt, "dup release"); \ - if (--mRefCnt == 0) { \ - NS_DELETEXPCOM(this); \ - return 0; \ - } \ - return mRefCnt; \ - } \ - \ - NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) \ - { \ - if (NULL == aInstancePtr) { \ - return NS_ERROR_NULL_POINTER; \ - } \ - \ - *aInstancePtr = NULL; \ - \ - static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); \ - static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); \ - if (aIID.Equals(kIFactoryIID)) { \ - *aInstancePtr = (void*) this; \ - NS_ADDREF_THIS(); \ - return NS_OK; \ - } \ - if (aIID.Equals(kISupportsIID)) { \ - *aInstancePtr = (void*) ((nsISupports*)this); \ - NS_ADDREF_THIS(); \ - return NS_OK; \ - } \ - return NS_NOINTERFACE; \ - } \ - \ - NS_IMETHOD CreateInstance(nsISupports *aOuter, \ - const nsIID &aIID, \ - void **aResult) \ - { \ - nsresult rv; \ - \ - _type * inst; \ - \ - if (NULL == aResult) { \ - rv = NS_ERROR_NULL_POINTER; \ - goto done; \ - } \ - *aResult = NULL; \ - if (NULL != aOuter) { \ - rv = NS_ERROR_NO_AGGREGATION; \ - goto done; \ - } \ - \ - NS_NEWXPCOM(inst, _type); \ - if (NULL == inst) { \ - rv = NS_ERROR_OUT_OF_MEMORY; \ - goto done; \ - } \ - NS_ADDREF(inst); \ - rv = inst->QueryInterface(aIID, aResult); \ - NS_RELEASE(inst); \ - \ - done: \ - return rv; \ - } \ - \ - NS_IMETHOD LockFactory(PRBool aLock) \ - { \ - return NS_OK; \ - } \ - \ - \ -protected: \ - virtual ~ns##_name##Factory() \ - { \ - NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction"); \ - } \ - \ - nsrefcnt mRefCnt; \ +#define NS_DEF_FACTORY(_name,_type) \ +class ns##_name##Factory : public nsIFactory \ +{ \ +public: \ + ns##_name##Factory() { NS_INIT_REFCNT(); } \ + \ + NS_IMETHOD_(nsrefcnt) AddRef (void) \ + { \ + return ++mRefCnt; \ + } \ + \ + NS_IMETHOD_(nsrefcnt) Release(void) \ + { \ + NS_PRECONDITION(0 != mRefCnt, "dup release"); \ + if (--mRefCnt == 0) { \ + NS_DELETEXPCOM(this); \ + return 0; \ + } \ + return mRefCnt; \ + } \ + \ + NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) \ + { \ + if (NULL == aInstancePtr) { \ + return NS_ERROR_NULL_POINTER; \ + } \ + \ + *aInstancePtr = NULL; \ + \ + static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); \ + static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); \ + if (aIID.Equals(kIFactoryIID)) { \ + *aInstancePtr = (void*) this; \ + NS_ADDREF_THIS(); \ + return NS_OK; \ + } \ + if (aIID.Equals(kISupportsIID)) { \ + *aInstancePtr = (void*) ((nsISupports*)this); \ + NS_ADDREF_THIS(); \ + return NS_OK; \ + } \ + return NS_NOINTERFACE; \ + } \ + \ + NS_IMETHOD CreateInstance(nsISupports *aOuter, \ + const nsIID &aIID, \ + void **aResult) \ + { \ + nsresult rv; \ + \ + _type * inst; \ + \ + if (NULL == aResult) { \ + rv = NS_ERROR_NULL_POINTER; \ + goto done; \ + } \ + *aResult = NULL; \ + if (NULL != aOuter) { \ + rv = NS_ERROR_NO_AGGREGATION; \ + goto done; \ + } \ + \ + NS_NEWXPCOM(inst, _type); \ + if (NULL == inst) { \ + rv = NS_ERROR_OUT_OF_MEMORY; \ + goto done; \ + } \ + NS_ADDREF(inst); \ + rv = inst->QueryInterface(aIID, aResult); \ + NS_RELEASE(inst); \ + \ + done: \ + return rv; \ + } \ + \ + NS_IMETHOD LockFactory(PRBool aLock) \ + { \ + return NS_OK; \ + } \ + \ + \ +protected: \ + virtual ~ns##_name##Factory() \ + { \ + NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction"); \ + } \ + \ + nsrefcnt mRefCnt; \ }; -#else -/* - * This file contains a templatized implementation of a simple XPCOM factory. - * - * To implement a factory for a given component, just provide a function - * like the one below which can be called by your DLL's NSGetFactory(...) - * entry point... - * - * nsresult NS_New_SomeComponent_Factory(nsIFactory** aResult) - * { - * nsresult rv = NS_OK; - * nsIFactory* inst = new nsFactory(); - * if (NULL == inst) { - * rv = NS_ERROR_OUT_OF_MEMORY; - * } else { - * NS_ADDREF(inst); - * } - * *aResult = inst; - * return rv; - * } - * - * NOTE: - * ---- - * The factories created by this template are not thread-safe and do not - * support aggregation. - * - */ -template class nsFactory : public nsIFactory -{ -public: - nsFactory() { NS_INIT_REFCNT(); } - - // - // nsISupports interface... - // - // These implementations were copied from the NS_IMPL_ISUPPORTS macro - // in nsISupports.h - // - NS_IMETHOD_(nsrefcnt) AddRef (void) - { - return ++mRefCnt; - } - - NS_IMETHOD_(nsrefcnt) Release(void) - { - NS_PRECONDITION(0 != mRefCnt, "dup release"); - if (--mRefCnt == 0) { - NS_DELETEXPCOM(this); - return 0; - } - return mRefCnt; - } - - NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) - { - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - *aInstancePtr = NULL; - - static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); - static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - if (aIID.Equals(kIFactoryIID)) { - *aInstancePtr = (void*) this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kISupportsIID)) { - *aInstancePtr = (void*) ((nsISupports*)this); - NS_ADDREF_THIS(); - return NS_OK; - } - return NS_NOINTERFACE; - } - - // - // nsIFactory interface... - // - NS_IMETHOD CreateInstance(nsISupports *aOuter, - const nsIID &aIID, - void **aResult) - { - nsresult rv; - T* inst; - // Parameter validation... - if (NULL == aResult) { - rv = NS_ERROR_NULL_POINTER; - goto done; - } - // Do not support aggregatable components... - *aResult = NULL; - if (NULL != aOuter) { - rv = NS_ERROR_NO_AGGREGATION; - goto done; - } - // Create a new instance of the component... - NS_NEWXPCOM(inst, T); - if (NULL == inst) { - rv = NS_ERROR_OUT_OF_MEMORY; - goto done; - } - // If the QI fails, the component will be destroyed... - NS_ADDREF(inst); - rv = inst->QueryInterface(aIID, aResult); - NS_RELEASE(inst); - - done: - return rv; - } - - NS_IMETHOD LockFactory(PRBool aLock) - { - // Not implemented in simplest case. - return NS_OK; - } - - -protected: - virtual ~nsFactory() - { - NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction"); - } - - // Reference count variable used by nsISupports... - nsrefcnt mRefCnt; -}; -#endif - #endif /* nsXPComFactory_h__ */ diff --git a/mozilla/xpcom/public/nsXPComFactory.h b/mozilla/xpcom/public/nsXPComFactory.h index b9763150235..6f2e4ab9c33 100644 --- a/mozilla/xpcom/public/nsXPComFactory.h +++ b/mozilla/xpcom/public/nsXPComFactory.h @@ -22,15 +22,6 @@ #include "nsIFactory.h" -/* - * TEMPLATES_IN_nsXPComFactory_EXORCISM is a temporary hack until I can - * verify that this works on windows and mac. -re - */ -#if defined(XP_UNIX) -#define TEMPLATES_IN_nsXPComFactory_EXORCISM 1 -#endif - -#if defined(TEMPLATES_IN_nsXPComFactory_EXORCISM) /* * This file contains a macro for the implementation of a simple XPCOM factory. * @@ -74,223 +65,94 @@ * support aggregation. * */ -#define NS_DEF_FACTORY(_name,_type) \ -class ns##_name##Factory : public nsIFactory \ -{ \ -public: \ - ns##_name##Factory() { NS_INIT_REFCNT(); } \ - \ - NS_IMETHOD_(nsrefcnt) AddRef (void) \ - { \ - return ++mRefCnt; \ - } \ - \ - NS_IMETHOD_(nsrefcnt) Release(void) \ - { \ - NS_PRECONDITION(0 != mRefCnt, "dup release"); \ - if (--mRefCnt == 0) { \ - NS_DELETEXPCOM(this); \ - return 0; \ - } \ - return mRefCnt; \ - } \ - \ - NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) \ - { \ - if (NULL == aInstancePtr) { \ - return NS_ERROR_NULL_POINTER; \ - } \ - \ - *aInstancePtr = NULL; \ - \ - static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); \ - static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); \ - if (aIID.Equals(kIFactoryIID)) { \ - *aInstancePtr = (void*) this; \ - NS_ADDREF_THIS(); \ - return NS_OK; \ - } \ - if (aIID.Equals(kISupportsIID)) { \ - *aInstancePtr = (void*) ((nsISupports*)this); \ - NS_ADDREF_THIS(); \ - return NS_OK; \ - } \ - return NS_NOINTERFACE; \ - } \ - \ - NS_IMETHOD CreateInstance(nsISupports *aOuter, \ - const nsIID &aIID, \ - void **aResult) \ - { \ - nsresult rv; \ - \ - _type * inst; \ - \ - if (NULL == aResult) { \ - rv = NS_ERROR_NULL_POINTER; \ - goto done; \ - } \ - *aResult = NULL; \ - if (NULL != aOuter) { \ - rv = NS_ERROR_NO_AGGREGATION; \ - goto done; \ - } \ - \ - NS_NEWXPCOM(inst, _type); \ - if (NULL == inst) { \ - rv = NS_ERROR_OUT_OF_MEMORY; \ - goto done; \ - } \ - NS_ADDREF(inst); \ - rv = inst->QueryInterface(aIID, aResult); \ - NS_RELEASE(inst); \ - \ - done: \ - return rv; \ - } \ - \ - NS_IMETHOD LockFactory(PRBool aLock) \ - { \ - return NS_OK; \ - } \ - \ - \ -protected: \ - virtual ~ns##_name##Factory() \ - { \ - NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction"); \ - } \ - \ - nsrefcnt mRefCnt; \ +#define NS_DEF_FACTORY(_name,_type) \ +class ns##_name##Factory : public nsIFactory \ +{ \ +public: \ + ns##_name##Factory() { NS_INIT_REFCNT(); } \ + \ + NS_IMETHOD_(nsrefcnt) AddRef (void) \ + { \ + return ++mRefCnt; \ + } \ + \ + NS_IMETHOD_(nsrefcnt) Release(void) \ + { \ + NS_PRECONDITION(0 != mRefCnt, "dup release"); \ + if (--mRefCnt == 0) { \ + NS_DELETEXPCOM(this); \ + return 0; \ + } \ + return mRefCnt; \ + } \ + \ + NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) \ + { \ + if (NULL == aInstancePtr) { \ + return NS_ERROR_NULL_POINTER; \ + } \ + \ + *aInstancePtr = NULL; \ + \ + static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); \ + static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); \ + if (aIID.Equals(kIFactoryIID)) { \ + *aInstancePtr = (void*) this; \ + NS_ADDREF_THIS(); \ + return NS_OK; \ + } \ + if (aIID.Equals(kISupportsIID)) { \ + *aInstancePtr = (void*) ((nsISupports*)this); \ + NS_ADDREF_THIS(); \ + return NS_OK; \ + } \ + return NS_NOINTERFACE; \ + } \ + \ + NS_IMETHOD CreateInstance(nsISupports *aOuter, \ + const nsIID &aIID, \ + void **aResult) \ + { \ + nsresult rv; \ + \ + _type * inst; \ + \ + if (NULL == aResult) { \ + rv = NS_ERROR_NULL_POINTER; \ + goto done; \ + } \ + *aResult = NULL; \ + if (NULL != aOuter) { \ + rv = NS_ERROR_NO_AGGREGATION; \ + goto done; \ + } \ + \ + NS_NEWXPCOM(inst, _type); \ + if (NULL == inst) { \ + rv = NS_ERROR_OUT_OF_MEMORY; \ + goto done; \ + } \ + NS_ADDREF(inst); \ + rv = inst->QueryInterface(aIID, aResult); \ + NS_RELEASE(inst); \ + \ + done: \ + return rv; \ + } \ + \ + NS_IMETHOD LockFactory(PRBool aLock) \ + { \ + return NS_OK; \ + } \ + \ + \ +protected: \ + virtual ~ns##_name##Factory() \ + { \ + NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction"); \ + } \ + \ + nsrefcnt mRefCnt; \ }; -#else -/* - * This file contains a templatized implementation of a simple XPCOM factory. - * - * To implement a factory for a given component, just provide a function - * like the one below which can be called by your DLL's NSGetFactory(...) - * entry point... - * - * nsresult NS_New_SomeComponent_Factory(nsIFactory** aResult) - * { - * nsresult rv = NS_OK; - * nsIFactory* inst = new nsFactory(); - * if (NULL == inst) { - * rv = NS_ERROR_OUT_OF_MEMORY; - * } else { - * NS_ADDREF(inst); - * } - * *aResult = inst; - * return rv; - * } - * - * NOTE: - * ---- - * The factories created by this template are not thread-safe and do not - * support aggregation. - * - */ -template class nsFactory : public nsIFactory -{ -public: - nsFactory() { NS_INIT_REFCNT(); } - - // - // nsISupports interface... - // - // These implementations were copied from the NS_IMPL_ISUPPORTS macro - // in nsISupports.h - // - NS_IMETHOD_(nsrefcnt) AddRef (void) - { - return ++mRefCnt; - } - - NS_IMETHOD_(nsrefcnt) Release(void) - { - NS_PRECONDITION(0 != mRefCnt, "dup release"); - if (--mRefCnt == 0) { - NS_DELETEXPCOM(this); - return 0; - } - return mRefCnt; - } - - NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) - { - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - *aInstancePtr = NULL; - - static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); - static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - if (aIID.Equals(kIFactoryIID)) { - *aInstancePtr = (void*) this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kISupportsIID)) { - *aInstancePtr = (void*) ((nsISupports*)this); - NS_ADDREF_THIS(); - return NS_OK; - } - return NS_NOINTERFACE; - } - - // - // nsIFactory interface... - // - NS_IMETHOD CreateInstance(nsISupports *aOuter, - const nsIID &aIID, - void **aResult) - { - nsresult rv; - T* inst; - // Parameter validation... - if (NULL == aResult) { - rv = NS_ERROR_NULL_POINTER; - goto done; - } - // Do not support aggregatable components... - *aResult = NULL; - if (NULL != aOuter) { - rv = NS_ERROR_NO_AGGREGATION; - goto done; - } - // Create a new instance of the component... - NS_NEWXPCOM(inst, T); - if (NULL == inst) { - rv = NS_ERROR_OUT_OF_MEMORY; - goto done; - } - // If the QI fails, the component will be destroyed... - NS_ADDREF(inst); - rv = inst->QueryInterface(aIID, aResult); - NS_RELEASE(inst); - - done: - return rv; - } - - NS_IMETHOD LockFactory(PRBool aLock) - { - // Not implemented in simplest case. - return NS_OK; - } - - -protected: - virtual ~nsFactory() - { - NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction"); - } - - // Reference count variable used by nsISupports... - nsrefcnt mRefCnt; -}; -#endif - #endif /* nsXPComFactory_h__ */ diff --git a/mozilla/xpcom/src/nsEventQueueService.cpp b/mozilla/xpcom/src/nsEventQueueService.cpp index 0379daae626..ea37c6fe0e8 100644 --- a/mozilla/xpcom/src/nsEventQueueService.cpp +++ b/mozilla/xpcom/src/nsEventQueueService.cpp @@ -251,7 +251,6 @@ done: static nsEventQueueServiceImpl* gServiceInstance = NULL; -#if defined(TEMPLATES_IN_nsXPComFactory_EXORCISM) NS_DEF_FACTORY(EventQueueServiceGen,nsEventQueueServiceImpl) class nsEventQueueServiceFactory : public nsEventQueueServiceGenFactory @@ -262,16 +261,6 @@ public: void **aResult); }; -#else -class nsEventQueueServiceFactory : public nsFactory -{ -public: - NS_IMETHOD CreateInstance(nsISupports *aOuter, - const nsIID &aIID, - void **aResult); -}; -#endif - NS_IMETHODIMP nsEventQueueServiceFactory::CreateInstance(nsISupports *aOuter, const nsIID &aIID, diff --git a/mozilla/xpcom/threads/nsEventQueueService.cpp b/mozilla/xpcom/threads/nsEventQueueService.cpp index 0379daae626..ea37c6fe0e8 100644 --- a/mozilla/xpcom/threads/nsEventQueueService.cpp +++ b/mozilla/xpcom/threads/nsEventQueueService.cpp @@ -251,7 +251,6 @@ done: static nsEventQueueServiceImpl* gServiceInstance = NULL; -#if defined(TEMPLATES_IN_nsXPComFactory_EXORCISM) NS_DEF_FACTORY(EventQueueServiceGen,nsEventQueueServiceImpl) class nsEventQueueServiceFactory : public nsEventQueueServiceGenFactory @@ -262,16 +261,6 @@ public: void **aResult); }; -#else -class nsEventQueueServiceFactory : public nsFactory -{ -public: - NS_IMETHOD CreateInstance(nsISupports *aOuter, - const nsIID &aIID, - void **aResult); -}; -#endif - NS_IMETHODIMP nsEventQueueServiceFactory::CreateInstance(nsISupports *aOuter, const nsIID &aIID, diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp index cf0184f3506..983432b407f 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp @@ -351,18 +351,12 @@ NS_EXPORT nsresult NS_NewAppShellService(nsIAppShellService** aResult) //---------------------------------------------------------------------- // Entry point to create nsAppShellService factory instances... -#if defined(TEMPLATES_IN_nsXPComFactory_EXORCISM) NS_DEF_FACTORY(AppShellService,nsAppShellService) -#endif nsresult NS_NewAppShellServiceFactory(nsIFactory** aResult) { nsresult rv = NS_OK; -#if defined(TEMPLATES_IN_nsXPComFactory_EXORCISM) nsIFactory* inst = new nsAppShellServiceFactory; -#else - nsIFactory* inst = new nsFactory(); -#endif if (nsnull == inst) { rv = NS_ERROR_OUT_OF_MEMORY; }