GCCifying Shyotl

indra/newview/llviewershadermgr.cpp

@@ -410,7 +410,7 @@ void LLViewerShaderMgr::setShaders()
 		//Flag base shader objects for deletion
 		//Don't worry-- they won't be deleted until no programs refrence them.
 		std::map<std::string, GLhandleARB>::iterator it = mShaderObjects.begin();
-		for(it;it!=mShaderObjects.end();++it)
+		for(; it!=mShaderObjects.end();++it)
 			if(it->second)
 				glDeleteObjectARB(it->second);
 		mShaderObjects.clear(); 

indra/newview/llviewershadermgr.h

@@ -227,13 +227,13 @@ public:
 
 	shader_iter beginShaders() const
 	{
-		return getGlobalShaderList().begin();
+		return (shader_iter)(getGlobalShaderList().begin());
 		//return mShaderList.begin();
 	}
 
 	shader_iter endShaders() const
 	{
-		return getGlobalShaderList().end();
+		return (shader_iter)(getGlobalShaderList().end());
 		//return mShaderList.end();
 	}