FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed the nameing of iterators to prevent clashes with VisualStudio's dumb

Browse Source 
compiler.
This commit is contained in:
Robert Osfield
2002-10-21 15:09:03 +00:00
parent 054fd3877c
commit 3be6ffd9c3
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/osgUtil/RenderBin.cpp
View File

@@ -252,21 +252,21 @@ void RenderBin::draw(osg::State& state,RenderLeaf*& previous)
void RenderBin::drawImplementation(osg::State& state,RenderLeaf*& previous)
{
// draw first set of draw bins.
RenderBinList::iterator itr;
for(itr = _bins.begin();
itr!=_bins.end() && itr->first<0;
++itr)
RenderBinList::iterator rbitr;
for(rbitr = _bins.begin();
rbitr!=_bins.end() && rbitr->first<0;
++rbitr)
{
itr->second->draw(state,previous);
rbitr->second->draw(state,previous);
}
// draw fine grained ordering.
for(RenderLeafList::iterator itr= _renderLeafList.begin();
itr!= _renderLeafList.end();
++itr)
for(RenderLeafList::iterator rlitr= _renderLeafList.begin();
rlitr!= _renderLeafList.end();
++rlitr)
{
RenderLeaf* rl = *itr;
RenderLeaf* rl = *rlitr;
rl->render(state,previous);
previous = rl;
}
@@ -292,10 +292,10 @@ void RenderBin::drawImplementation(osg::State& state,RenderLeaf*& previous)
// draw post bins.
for(;
itr!=_bins.end();
++itr)
rbitr!=_bins.end();
++rbitr)
{
itr->second->draw(state,previous);
rbitr->second->draw(state,previous);
}