Fix or supress various warnings under GCC builds

Signed-off-by: Rye <rye@alchemyviewer.org>

4 files changed, 18 insertions, 20 deletions

diff --git a/indra/llmath/llcalc.cpp b/indra/llmath/llcalc.cpp
index e060b5df58..311e1e7059 100644
--- a/indra/llmath/llcalc.cpp
+++ b/indra/llmath/llcalc.cpp
@@ -116,17 +116,6 @@ void LLCalc::clearAllVariables()
     mVariables.clear();
 }
 
-/*
-void LLCalc::updateVariables(LLSD& vars)
-{
-    LLSD::map_iterator cIt = vars.beginMap();
-    for(; cIt != vars.endMap(); cIt++)
-    {
-        setVar(cIt->first, (F32)(LLSD::Real)cIt->second);
-    }
-}
-*/
-
 bool LLCalc::evalString(const std::string& expression, F32& result)
 {
     std::string expr_upper = expression;
diff --git a/indra/llmath/llcalc.h b/indra/llmath/llcalc.h
index 09672eb13b..14797de996 100644
--- a/indra/llmath/llcalc.h
+++ b/indra/llmath/llcalc.h
@@ -73,10 +73,9 @@ public:
     void    setVar(const std::string& name, const F32& value);
     void    clearVar(const std::string& name);
     void    clearAllVariables();
-//  void    updateVariables(LLSD& vars);
 
     bool    evalString(const std::string& expression, F32& result);
-    std::string::size_type  getLastErrorPos()   { return mLastErrorPos; }
+    std::string::size_type getLastErrorPos() const { return mLastErrorPos; }
 
     static LLCalc* getInstance();
     static void cleanUp();
@@ -89,10 +88,6 @@ private:
     calc_map_t  mConstants;
     calc_map_t  mVariables;
 
-    // *TODO: Add support for storing user defined variables, and stored functions.
-    //  Will need UI work, and a means to save them between sessions.
-//  calc_map_t mUserVariables;
-
     // "There shall be only one"
     static LLCalc*  sInstance;
 };
diff --git a/indra/llmath/llcalcparser.h b/indra/llmath/llcalcparser.h
index ea71752ebc..fe4e6bb1a4 100644
--- a/indra/llmath/llcalcparser.h
+++ b/indra/llmath/llcalcparser.h
@@ -27,6 +27,13 @@
 #ifndef LL_CALCPARSER_H
 #define LL_CALCPARSER_H
 
+#include "llpreprocessor.h"
+
+#if defined(LL_GNUC) && GCC_VERSION >= 130000
+#   pragma GCC diagnostic push
+#   pragma GCC diagnostic ignored "-Wdangling-pointer"
+#endif
+
 #include <boost/spirit/include/classic_attribute.hpp>
 #include <boost/spirit/include/classic_core.hpp>
 #include <boost/spirit/include/classic_error_handling.hpp>
@@ -35,6 +42,10 @@
 #include <boost/spirit/include/classic_symbols.hpp>
 using namespace boost::spirit::classic;
 
+#if defined(LL_GNUC) && GCC_VERSION >= 130000
+#   pragma GCC diagnostic pop
+#endif
+
 #include "llcalc.h"
 #include "llmath.h"
 
@@ -131,14 +142,14 @@ struct LLCalcParser : grammar<LLCalcParser>
 
             power =
                 unary_expr[power.value = arg1] >>
-                *('^' >> assert_syntax(unary_expr[power.value = phoenix::bind(&powf)(power.value, arg1)]))
+                *('^' >> assert_syntax(unary_expr[power.value = phoenix::bind(&LLCalcParser::_pow)(self, power.value, arg1)]))
             ;
 
             term =
                 power[term.value = arg1] >>
                 *(('*' >> assert_syntax(power[term.value *= arg1])) |
                   ('/' >> assert_syntax(power[term.value /= arg1])) |
-                  ('%' >> assert_syntax(power[term.value = phoenix::bind(&fmodf)(term.value, arg1)]))
+                  ('%' >> assert_syntax(power[term.value = phoenix::bind(&LLCalcParser::_fmod)(self, term.value, arg1)]))
                 )
             ;
 
@@ -177,10 +188,11 @@ private:
     F32 _floor(const F32& a) const { return (F32)llfloor(a); }
     F32 _ceil(const F32& a) const { return (F32)llceil(a); }
     F32 _atan2(const F32& a,const F32& b) const { return atan2(a,b); }
+    F32 _pow(const F32& a, const F32& b) const { return powf(a, b); }
+    F32 _fmod(const F32&a, const F32& b) const { return fmodf(a, b); }
 
     LLCalc::calc_map_t* mConstants;
     LLCalc::calc_map_t* mVariables;
-//  LLCalc::calc_map_t* mUserVariables;
 
     F32&        mResult;
 };
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index b3cb278d59..dfad66040e 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -2348,7 +2348,9 @@ bool LLVolume::unpackVolumeFacesInternal(const LLSD& mdl)
 
             const LLSD::Binary& pos = mdl[i]["Position"].asBinary();
             const LLSD::Binary& norm = mdl[i]["Normal"].asBinary();
+#if 0 // keep this code for now in case we decide to add support for on-the-wire tangents
             const LLSD::Binary& tangent = mdl[i]["Tangent"].asBinary();
+#endif
             const LLSD::Binary& tc = mdl[i]["TexCoord0"].asBinary();
             const LLSD::Binary& idx = mdl[i]["TriangleList"].asBinary();