From 2865cdf005887c4da9bfea38323e1987600a98e0 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Fri, 6 Nov 2020 16:50:52 -0500
Subject: [PATCH] Fix a few warnings due to proper gcc warning supression

---
 indra/llcommon/llsdutil.cpp     | 2 +-
 indra/llcommon/llstring.h       | 2 +-
 indra/llmessage/llnamevalue.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
index 384b6cb8f77..f53e7981e2b 100644
--- a/indra/llcommon/llsdutil.cpp
+++ b/indra/llcommon/llsdutil.cpp
@@ -47,7 +47,7 @@
 #include <set>
 #include <boost/range.hpp>
 
-#if LL_GNUC
+#if LL_GNUC && GCC_VERSION >= 80000
 #pragma GCC diagnostic ignored "-Wstringop-truncation"
 #endif
 
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index b4bc7fbd844..461e7fd4942 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -33,7 +33,7 @@
 #endif
 #include <boost/optional/optional.hpp>
 #include <absl/container/flat_hash_map.h>
-#if LL_GNUC
+#if LL_GNUC && GCC_VERSION >= 90000
 #pragma GCC diagnostic pop
 #endif
 #include <string>
diff --git a/indra/llmessage/llnamevalue.cpp b/indra/llmessage/llnamevalue.cpp
index 3a26b906116..23b8cf98683 100644
--- a/indra/llmessage/llnamevalue.cpp
+++ b/indra/llmessage/llnamevalue.cpp
@@ -35,7 +35,7 @@
 #include "llstring.h"
 #include "llstringtable.h"
 
-#if LL_GNUC
+#if LL_GNUC && GCC_VERSION >= 80000
 #pragma GCC diagnostic ignored "-Wstringop-truncation"
 #endif
 
-- 
GitLab