Fixed shadows warnings

This commit is contained in:
Robert Osfield
2016-05-23 20:02:36 +01:00
parent 2056800017
commit c36c0033fd
9 changed files with 34 additions and 35 deletions

View File

@@ -54,13 +54,15 @@ bool osgDB::queryPlugin(const std::string& fileName, ReaderWriterInfoList& infoL
typedef std::set<const ReaderWriter*> ReaderWriterSet;
ReaderWriterSet previouslyLoadedReaderWriters;
const Registry::ReaderWriterList& rwList = osgDB::Registry::instance()->getReaderWriterList();
for(Registry::ReaderWriterList::const_iterator itr = rwList.begin();
itr != rwList.end();
++itr)
{
const ReaderWriter* rw = itr->get();
previouslyLoadedReaderWriters.insert(rw);
const Registry::ReaderWriterList& rwList = osgDB::Registry::instance()->getReaderWriterList();
for(Registry::ReaderWriterList::const_iterator itr = rwList.begin();
itr != rwList.end();
++itr)
{
const ReaderWriter* rw = itr->get();
previouslyLoadedReaderWriters.insert(rw);
}
}
if (osgDB::Registry::instance()->loadLibrary(fileName))