зеркало из https://github.com/mozilla/pjs.git
changing a member name in hopes that this has something to do with the Mac bustage. I can't see what else might be wrong. Pure voodoo!
This commit is contained in:
Родитель
adffb355e6
Коммит
f30475caf2
|
@ -62,7 +62,7 @@ nsInterfaceInfoManager::GetInterfaceInfoManager()
|
||||||
if(!impl)
|
if(!impl)
|
||||||
{
|
{
|
||||||
impl = new nsInterfaceInfoManager();
|
impl = new nsInterfaceInfoManager();
|
||||||
if(!impl->initialized)
|
if(!impl->ctor_succeeded)
|
||||||
NS_RELEASE(impl);
|
NS_RELEASE(impl);
|
||||||
}
|
}
|
||||||
if(impl)
|
if(impl)
|
||||||
|
@ -90,7 +90,7 @@ static NS_DEFINE_IID(kAllocatorCID, NS_ALLOCATOR_CID);
|
||||||
static NS_DEFINE_IID(kIAllocatorIID, NS_IALLOCATOR_IID);
|
static NS_DEFINE_IID(kIAllocatorIID, NS_IALLOCATOR_IID);
|
||||||
|
|
||||||
nsInterfaceInfoManager::nsInterfaceInfoManager()
|
nsInterfaceInfoManager::nsInterfaceInfoManager()
|
||||||
: allocator(NULL), typelibRecords(NULL), initialized(PR_FALSE)
|
: allocator(NULL), typelibRecords(NULL), ctor_succeeded(PR_FALSE)
|
||||||
{
|
{
|
||||||
NS_INIT_REFCNT();
|
NS_INIT_REFCNT();
|
||||||
NS_ADDREF_THIS();
|
NS_ADDREF_THIS();
|
||||||
|
@ -102,7 +102,7 @@ nsInterfaceInfoManager::nsInterfaceInfoManager()
|
||||||
PR_ASSERT(this->allocator != NULL);
|
PR_ASSERT(this->allocator != NULL);
|
||||||
|
|
||||||
if(NS_SUCCEEDED(this->initInterfaceTables()))
|
if(NS_SUCCEEDED(this->initInterfaceTables()))
|
||||||
initialized = PR_TRUE;
|
ctor_succeeded = PR_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static
|
static
|
||||||
|
|
|
@ -1,77 +0,0 @@
|
||||||
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
||||||
/*
|
|
||||||
* The contents of this file are subject to the Netscape Public License
|
|
||||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
|
||||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
|
||||||
* http://www.mozilla.org/NPL/
|
|
||||||
*
|
|
||||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
|
||||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
|
||||||
* for the specific language governing rights and limitations under the
|
|
||||||
* NPL.
|
|
||||||
*
|
|
||||||
* The Initial Developer of this code under the NPL is Netscape
|
|
||||||
* Communications Corporation. Portions created by Netscape are
|
|
||||||
* Copyright (C) 1999 Netscape Communications Corporation. All Rights
|
|
||||||
* Reserved.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Library-private header for nsInterfaceInfoManager implementation. */
|
|
||||||
|
|
||||||
#ifndef nsInterfaceInfoManager_h___
|
|
||||||
#define nsInterfaceInfoManager_h___
|
|
||||||
|
|
||||||
#include "plhash.h"
|
|
||||||
#include "nsIAllocator.h"
|
|
||||||
#include "nsIInterfaceInfo.h"
|
|
||||||
#include "nsIInterfaceInfoManager.h"
|
|
||||||
#include "nsHashtable.h"
|
|
||||||
|
|
||||||
#include "xpt_struct.h"
|
|
||||||
#include "nsInterfaceInfo.h"
|
|
||||||
|
|
||||||
#include "nsInterfaceRecord.h"
|
|
||||||
#include "nsTypelibRecord.h"
|
|
||||||
|
|
||||||
|
|
||||||
class nsInterfaceInfoManager : public nsIInterfaceInfoManager
|
|
||||||
{
|
|
||||||
NS_DECL_ISUPPORTS
|
|
||||||
|
|
||||||
// nsIInformationInfo management services
|
|
||||||
NS_IMETHOD GetInfoForIID(const nsIID* iid, nsIInterfaceInfo** info);
|
|
||||||
NS_IMETHOD GetInfoForName(const char* name, nsIInterfaceInfo** info);
|
|
||||||
|
|
||||||
// name <-> IID mapping services
|
|
||||||
NS_IMETHOD GetIIDForName(const char* name, nsIID** iid);
|
|
||||||
NS_IMETHOD GetNameForIID(const nsIID* iid, char** name);
|
|
||||||
|
|
||||||
public:
|
|
||||||
virtual ~nsInterfaceInfoManager();
|
|
||||||
static nsInterfaceInfoManager* GetInterfaceInfoManager();
|
|
||||||
static nsIAllocator* GetAllocator(nsInterfaceInfoManager* iim = NULL);
|
|
||||||
|
|
||||||
private:
|
|
||||||
nsInterfaceInfoManager();
|
|
||||||
nsresult initInterfaceTables();
|
|
||||||
|
|
||||||
// Should this be public?
|
|
||||||
nsresult indexify_file(const char *filename);
|
|
||||||
|
|
||||||
// list of typelib records for enumeration. (freeing?)
|
|
||||||
nsTypelibRecord *typelibRecords;
|
|
||||||
|
|
||||||
// mapping between names and records
|
|
||||||
PLHashTable *nameTable;
|
|
||||||
|
|
||||||
// mapping between IIDs and records.
|
|
||||||
nsHashtable *IIDTable;
|
|
||||||
|
|
||||||
nsIAllocator *allocator;
|
|
||||||
PRBool initialized;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* nsInterfaceInfoManager_h___ */
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ nsInterfaceInfoManager::GetInterfaceInfoManager()
|
||||||
if(!impl)
|
if(!impl)
|
||||||
{
|
{
|
||||||
impl = new nsInterfaceInfoManager();
|
impl = new nsInterfaceInfoManager();
|
||||||
if(!impl->initialized)
|
if(!impl->ctor_succeeded)
|
||||||
NS_RELEASE(impl);
|
NS_RELEASE(impl);
|
||||||
}
|
}
|
||||||
if(impl)
|
if(impl)
|
||||||
|
@ -90,7 +90,7 @@ static NS_DEFINE_IID(kAllocatorCID, NS_ALLOCATOR_CID);
|
||||||
static NS_DEFINE_IID(kIAllocatorIID, NS_IALLOCATOR_IID);
|
static NS_DEFINE_IID(kIAllocatorIID, NS_IALLOCATOR_IID);
|
||||||
|
|
||||||
nsInterfaceInfoManager::nsInterfaceInfoManager()
|
nsInterfaceInfoManager::nsInterfaceInfoManager()
|
||||||
: allocator(NULL), typelibRecords(NULL), initialized(PR_FALSE)
|
: allocator(NULL), typelibRecords(NULL), ctor_succeeded(PR_FALSE)
|
||||||
{
|
{
|
||||||
NS_INIT_REFCNT();
|
NS_INIT_REFCNT();
|
||||||
NS_ADDREF_THIS();
|
NS_ADDREF_THIS();
|
||||||
|
@ -102,7 +102,7 @@ nsInterfaceInfoManager::nsInterfaceInfoManager()
|
||||||
PR_ASSERT(this->allocator != NULL);
|
PR_ASSERT(this->allocator != NULL);
|
||||||
|
|
||||||
if(NS_SUCCEEDED(this->initInterfaceTables()))
|
if(NS_SUCCEEDED(this->initInterfaceTables()))
|
||||||
initialized = PR_TRUE;
|
ctor_succeeded = PR_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static
|
static
|
||||||
|
|
|
@ -68,7 +68,7 @@ private:
|
||||||
nsHashtable *IIDTable;
|
nsHashtable *IIDTable;
|
||||||
|
|
||||||
nsIAllocator *allocator;
|
nsIAllocator *allocator;
|
||||||
PRBool initialized;
|
PRBool ctor_succeeded;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* nsInterfaceInfoManager_h___ */
|
#endif /* nsInterfaceInfoManager_h___ */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче