corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1204403 - Fix -Wshadow warnings in xpcom. r=mccr8

Browse Source
This commit is contained in:
Chris Peterson
2015-09-07 23:56:16 -07:00
parent c4118e15a0
commit db45e51be4
26 changed files with 215 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xpcom/glue/GenericModule.cpp
View File

@@ -50,17 +50,17 @@ GenericModule::RegisterSelf(nsIComponentManager* aCompMgr,
const char* aLoaderStr,
const char* aType)
{
nsCOMPtr<nsIComponentRegistrar> r = do_QueryInterface(aCompMgr);
nsCOMPtr<nsIComponentRegistrar> registrar = do_QueryInterface(aCompMgr);
for (const Module::CIDEntry* e = mData->mCIDs; e->cid; ++e) {
r->RegisterFactoryLocation(*e->cid, "", nullptr, aLocation,
aLoaderStr, aType);
registrar->RegisterFactoryLocation(*e->cid, "", nullptr, aLocation,
aLoaderStr, aType);
}
for (const Module::ContractIDEntry* e = mData->mContractIDs;
e && e->contractid;
++e) {
r->RegisterFactoryLocation(*e->cid, "", e->contractid, aLocation,
aLoaderStr, aType);
registrar->RegisterFactoryLocation(*e->cid, "", e->contractid, aLocation,
aLoaderStr, aType);
}
nsCOMPtr<nsICategoryManager> catman;
@@ -71,9 +71,9 @@ GenericModule::RegisterSelf(nsIComponentManager* aCompMgr,
catman = do_GetService(NS_CATEGORYMANAGER_CONTRACTID);
}
nsAutoCString r;
nsAutoCString prevValue;
catman->AddCategoryEntry(e->category, e->entry, e->value, true, true,
getter_Copies(r));
getter_Copies(prevValue));
}
return NS_OK;
}