Fix compile errors and warnings on linux after merging Shyotl.

This commit is contained in:
Lirusaito
2014-07-22 03:39:01 -04:00
parent 5191baa659
commit 41eb687243
8 changed files with 41 additions and 26 deletions

View File

@@ -301,7 +301,8 @@ void LLFacePool::removeFaceReference(LLFace *facep)
if (idx != -1)
{
facep->setReferenceIndex(-1);
std::vector<LLFace*>::iterator iter = vector_replace_with_last(mReferences, mReferences.begin() + idx);
std::vector<LLFace*>::iterator face_it(mReferences.begin() + idx);
std::vector<LLFace*>::iterator iter = vector_replace_with_last(mReferences, face_it);
if(iter != mReferences.end())
(*iter)->setReferenceIndex(idx);
}