Skip to content
Snippets Groups Projects
Commit 6ce1ff43 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Cleanup up repeated calls to endInstances

parent 7af90c5e
No related branches found
No related tags found
No related merge requests found
...@@ -58,7 +58,7 @@ LLEventTimer::~LLEventTimer() ...@@ -58,7 +58,7 @@ LLEventTimer::~LLEventTimer()
void LLEventTimer::updateClass() void LLEventTimer::updateClass()
{ {
std::list<LLEventTimer*> completed_timers; std::list<LLEventTimer*> completed_timers;
for (instance_iter iter = beginInstances(); iter != endInstances(); ) for (instance_iter iter = beginInstances(), end = endInstances(); iter != end; )
{ {
LLEventTimer& timer = *iter++; LLEventTimer& timer = *iter++;
F32 et = timer.mEventTimer.getElapsedTimeF32(); F32 et = timer.mEventTimer.getElapsedTimeF32();
...@@ -73,11 +73,9 @@ void LLEventTimer::updateClass() ...@@ -73,11 +73,9 @@ void LLEventTimer::updateClass()
if ( completed_timers.size() > 0 ) if ( completed_timers.size() > 0 )
{ {
for (std::list<LLEventTimer*>::iterator completed_iter = completed_timers.begin(); for (LLEventTimer* completed_timer : completed_timers)
completed_iter != completed_timers.end();
completed_iter++ )
{ {
delete *completed_iter; delete completed_timer;
} }
} }
} }
......
...@@ -2390,7 +2390,7 @@ void LLGLNamePool::release(GLuint name) ...@@ -2390,7 +2390,7 @@ void LLGLNamePool::release(GLuint name)
//static //static
void LLGLNamePool::upkeepPools() void LLGLNamePool::upkeepPools()
{ {
for (tracker_t::instance_iter iter = beginInstances(); iter != endInstances(); ++iter) for (tracker_t::instance_iter iter = beginInstances(), end = endInstances(); iter != end; ++iter)
{ {
LLGLNamePool & pool = *iter; LLGLNamePool & pool = *iter;
pool.upkeep(); pool.upkeep();
...@@ -2400,7 +2400,7 @@ void LLGLNamePool::upkeepPools() ...@@ -2400,7 +2400,7 @@ void LLGLNamePool::upkeepPools()
//static //static
void LLGLNamePool::cleanupPools() void LLGLNamePool::cleanupPools()
{ {
for (tracker_t::instance_iter iter = beginInstances(); iter != endInstances(); ++iter) for (tracker_t::instance_iter iter = beginInstances(), end = endInstances(); iter != end; ++iter)
{ {
LLGLNamePool & pool = *iter; LLGLNamePool & pool = *iter;
pool.cleanup(); pool.cleanup();
......
...@@ -371,7 +371,7 @@ LLConsole::Paragraph::Paragraph (LLWString str, const LLColor4 &color, F32 add_t ...@@ -371,7 +371,7 @@ LLConsole::Paragraph::Paragraph (LLWString str, const LLColor4 &color, F32 add_t
// static // static
void LLConsole::updateClass() void LLConsole::updateClass()
{ {
for (instance_iter it = beginInstances(); it != endInstances(); ++it) for (instance_iter it = beginInstances(), it_end = endInstances(); it != it_end; ++it)
{ {
it->update(); it->update();
} }
......
...@@ -636,7 +636,7 @@ void LLLayoutStack::createResizeBar(LLLayoutPanel* panelp) ...@@ -636,7 +636,7 @@ void LLLayoutStack::createResizeBar(LLLayoutPanel* panelp)
//static //static
void LLLayoutStack::updateClass() void LLLayoutStack::updateClass()
{ {
for (instance_iter it = beginInstances(); it != endInstances(); ++it) for (instance_iter it = beginInstances(), end = endInstances(); it != end; ++it)
{ {
it->updateLayout(); it->updateLayout();
it->mAnimatedThisFrame = false; it->mAnimatedThisFrame = false;
......
...@@ -612,8 +612,9 @@ S32 LLToast::notifyParent(const LLSD& info) ...@@ -612,8 +612,9 @@ S32 LLToast::notifyParent(const LLSD& info)
//static //static
void LLToast::updateClass() void LLToast::updateClass()
{ {
for (LLInstanceTracker<LLToast>::instance_iter iter = LLInstanceTracker<LLToast>::beginInstances(); for (LLInstanceTracker<LLToast>::instance_iter iter = LLInstanceTracker<LLToast>::beginInstances(),
iter != LLInstanceTracker<LLToast>::endInstances(); ) end = LLInstanceTracker<LLToast>::endInstances();
iter != end; )
{ {
LLToast& toast = *iter++; LLToast& toast = *iter++;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment