From c13ed02ec8b256379c3dfea66333cdb34f616012 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Wed, 8 May 2013 00:55:50 -0400 Subject: [PATCH] Compile fixes (for GCC 4.8) --- indra/llmath/llcalcparser.h | 4 ++-- indra/newview/llpanelface.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/llmath/llcalcparser.h b/indra/llmath/llcalcparser.h index 0fcd38064..e3eb2bded 100644 --- a/indra/llmath/llcalcparser.h +++ b/indra/llmath/llcalcparser.h @@ -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 T min_glue(T a, T b) @@ -91,7 +91,7 @@ struct lazy_bfunc_ } }; -} // end namespace anonymous +//} // end namespace anonymous template struct grammar diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 2fc014216..7f43b4ce3 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -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: