Fix or supress various warnings under GCC builds

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

11 files changed, 35 insertions, 33 deletions

diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
index 1c5fe9d2f5..c5a7a0e56b 100644
--- a/indra/llcommon/llfasttimer.cpp
+++ b/indra/llcommon/llfasttimer.cpp
@@ -387,6 +387,11 @@ void BlockTimer::logStats()
 
 }
 
+#if defined(LL_GNUC) && GCC_VERSION >= 130000
+#   pragma GCC diagnostic push
+#   pragma GCC diagnostic ignored "-Wnonnull"
+#endif
+
 //static
 void BlockTimer::dumpCurTimes()
 {
@@ -418,8 +423,12 @@ void BlockTimer::dumpCurTimes()
             << num_calls << " calls";
 
         LL_INFOS() << out_str.str() << LL_ENDL;
+    }
 }
-}
+
+#if defined(LL_GNUC) && GCC_VERSION >= 130000
+#   pragma GCC diagnostic push
+#endif
 
 //static
 void BlockTimer::writeLog(std::ostream& os)
diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index c23adca7e8..f010f0e961 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -32,11 +32,6 @@
 #include "lltracethreadrecorder.h"
 #include "llthread.h"
 
-inline F64 lerp(F64 a, F64 b, F64 u)
-{
-    return a + ((b - a) * u);
-}
-
 namespace LLTrace
 {
 
@@ -302,7 +297,7 @@ F64 Recording::getMean( const StatType<SampleAccumulator>& stat )
         {
             t = (F64)active_accumulator->getSampleCount() / (F64)div;
         }
-        return lerp(accumulator.getMean(), active_accumulator->getMean(), t);
+        return std::lerp(accumulator.getMean(), active_accumulator->getMean(), t);
     }
     else
     {
@@ -388,7 +383,7 @@ F64 Recording::getMean( const StatType<EventAccumulator>& stat )
         {
             t = (F64)active_accumulator->getSampleCount() / (F64)div;
         }
-        return lerp(accumulator.getMean(), active_accumulator->getMean(), t);
+        return std::lerp(accumulator.getMean(), active_accumulator->getMean(), t);
     }
     else
     {
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();
 
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 81ebe631c5..71fc2b4fc0 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -1078,7 +1078,7 @@ bool LLDAELoader::OpenFile(const std::string& filename)
                 LLModel* mdl = *i;
                 if(mdl->getStatus() != LLModel::NO_ERRORS)
                 {
-                    setLoadState(ERROR_MODEL + mdl->getStatus()) ;
+                    setLoadState(static_cast<U32>(ERROR_MODEL) + static_cast<U32>(mdl->getStatus()));
                     return false; //abort
                 }
 
diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp
index 68f3f5ffac..c70a8f6483 100644
--- a/indra/llprimitive/llprimtexturelist.cpp
+++ b/indra/llprimitive/llprimtexturelist.cpp
@@ -137,7 +137,7 @@ S32 LLPrimTextureList::copyTexture(const U8 index, const LLTextureEntry& te)
         // we're changing an existing entry
     llassert(mEntryList[index]);
     delete (mEntryList[index]);
-    if  (&te)
+    if  (te != LLTextureEntry::null)
     {
         mEntryList[index] = te.newCopy();
     }
diff --git a/indra/newview/gltf/llgltfloader.cpp b/indra/newview/gltf/llgltfloader.cpp
index 4f8f80129d..12bd5661d2 100644
--- a/indra/newview/gltf/llgltfloader.cpp
+++ b/indra/newview/gltf/llgltfloader.cpp
@@ -489,7 +489,7 @@ void LLGLTFLoader::processNodeHierarchy(S32 node_idx, std::map<std::string, S32>
         }
         else
         {
-            setLoadState(ERROR_MODEL + pModel->getStatus());
+            setLoadState(static_cast<U32>(ERROR_MODEL) + static_cast<U32>(pModel->getStatus()));
             delete pModel;
             return;
         }
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index a9e860d2ef..2ddc09736f 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -1309,7 +1309,7 @@ void LLPanelOutfitEdit::showFilteredWearablesListView(LLWearableType::EType type
     showWearablesListView();
 
     //e_list_view_item_type implicitly contains LLWearableType::EType starting from LVIT_SHAPE
-    applyListViewFilter(static_cast<EListViewItemType>(LVIT_SHAPE + type));
+    applyListViewFilter(static_cast<EListViewItemType>(static_cast<U32>(LVIT_SHAPE) + static_cast<U32>(type)));
     mWearableItemsList->setMenuWearableType(type);
 }
 
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp
index 7fbcb5fc04..5b24d46bb0 100644
--- a/indra/newview/llxmlrpctransaction.cpp
+++ b/indra/newview/llxmlrpctransaction.cpp
@@ -218,7 +218,7 @@ LLXMLRPCTransaction::Impl::Impl
     mCertStore = gSavedSettings.getString("CertStore");
 
     httpOpts->setSSLVerifyPeer(vefifySSLCert);
-    httpOpts->setSSLVerifyHost(vefifySSLCert ? 2 : 0);
+    httpOpts->setSSLVerifyHost(vefifySSLCert);
 
     // LLRefCounted starts with a 1 ref, so don't add a ref in the smart pointer
     httpHeaders = LLCore::HttpHeaders::ptr_t(new LLCore::HttpHeaders());