diff --git a/indra/llcommon/lleventtimer.cpp b/indra/llcommon/lleventtimer.cpp
index 0d96e03da41ba1d07ff5f0aae9e85ed33b7a8581..f3fe48843315173b1f8c9ba65b698144ad78887b 100644
--- a/indra/llcommon/lleventtimer.cpp
+++ b/indra/llcommon/lleventtimer.cpp
@@ -58,7 +58,7 @@ LLEventTimer::~LLEventTimer()
 void LLEventTimer::updateClass() 
 {
 	std::list<LLEventTimer*> completed_timers;
-	for (instance_iter iter = beginInstances(); iter != endInstances(); ) 
+	for (instance_iter iter = beginInstances(), end = endInstances(); iter != end; )
 	{
 		LLEventTimer& timer = *iter++;
 		F32 et = timer.mEventTimer.getElapsedTimeF32();
@@ -73,11 +73,9 @@ void LLEventTimer::updateClass()
 
 	if ( completed_timers.size() > 0 )
 	{
-		for (std::list<LLEventTimer*>::iterator completed_iter = completed_timers.begin(); 
-			 completed_iter != completed_timers.end(); 
-			 completed_iter++ ) 
+		for (LLEventTimer* completed_timer : completed_timers) 
 		{
-			delete *completed_iter;
+			delete completed_timer;
 		}
 	}
 }
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index c01c15391de812273bea8f96c7ebcd03f19dbaa1..474c1395f683701cb27a90bca3b10e9f798c8b2e 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -2390,7 +2390,7 @@ void LLGLNamePool::release(GLuint name)
 //static
 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;
 		pool.upkeep();
@@ -2400,7 +2400,7 @@ void LLGLNamePool::upkeepPools()
 //static
 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;
 		pool.cleanup();
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp
index d4d1ad3259f0cb43a0a933358acd46433ffe24e4..446e3d73444f9d0257f661a3858966c85b5ed052 100644
--- a/indra/llui/llconsole.cpp
+++ b/indra/llui/llconsole.cpp
@@ -371,7 +371,7 @@ LLConsole::Paragraph::Paragraph (LLWString str, const LLColor4 &color, F32 add_t
 // static
 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();
 	} 
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 4a464b3507ccbd79c1b9cbf6099200ed5a7aa344..654bcab773f0ac12cedf6c2cdfdbd2b8a5bac1a7 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -636,7 +636,7 @@ void LLLayoutStack::createResizeBar(LLLayoutPanel* panelp)
 //static 
 void LLLayoutStack::updateClass()
 {
-	for (instance_iter it = beginInstances(); it != endInstances(); ++it)
+	for (instance_iter it = beginInstances(), end = endInstances(); it != end; ++it)
 	{
 		it->updateLayout();
 		it->mAnimatedThisFrame = false;
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 870e0d94f0c03518b6dda3e5924ea5382afe378a..c9ce72268f1355fa11b97e10ba9f83ace8fc8fdb 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -612,8 +612,9 @@ S32	LLToast::notifyParent(const LLSD& info)
 //static
 void LLToast::updateClass()
 {
-	for (LLInstanceTracker<LLToast>::instance_iter iter = LLInstanceTracker<LLToast>::beginInstances(); 
-			iter != LLInstanceTracker<LLToast>::endInstances(); ) 
+	for (LLInstanceTracker<LLToast>::instance_iter iter = LLInstanceTracker<LLToast>::beginInstances(),
+		end = LLInstanceTracker<LLToast>::endInstances();
+			iter != end; )
 	{
 		LLToast& toast = *iter++;