Compile fixes (for GCC 4.8)

This commit is contained in:
Lirusaito
2013-05-08 00:55:50 -04:00
parent f48eca366a
commit c13ed02ec8
2 changed files with 4 additions and 4 deletions

View File

@@ -41,7 +41,7 @@ namespace expression {
//TODO: If we can find a better way to do this with boost::pheonix::bind lets do it
namespace { // anonymous
//namespace { // anonymous
template <typename T>
T min_glue(T a, T b)
@@ -91,7 +91,7 @@ struct lazy_bfunc_
}
};
} // end namespace anonymous
//} // end namespace anonymous
template <typename FPT, typename Iterator>
struct grammar

View File

@@ -491,7 +491,7 @@ void LLPanelFace::sendTextureInfo()
return (object->mDrawable) ? object->mDrawable->getFace(te): NULL;
}
} get_last_face_func;
LLFace* last_face;
LLFace* last_face(NULL);
LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue(&get_last_face_func, last_face);
LLPanelFaceSetAlignedTEFunctor setfunc(this, last_face);
@@ -654,7 +654,7 @@ void LLPanelFace::getState()
return (object->mDrawable) ? object->mDrawable->getFace(te): NULL;
}
} get_te_face_func;
LLFace* last_face;
LLFace* last_face(NULL);
LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue(&get_te_face_func, last_face);
LLPanelFaceGetIsAlignedTEFunctor get_is_aligend_func(last_face);
// this will determine if the texture param controls are tentative: