From fefb876fe7b12a21f22db36a603e862b93f22967 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Tue, 18 Feb 2025 20:33:29 -0600
Subject: [PATCH] [nostalgia/gfx] Add checks for GCC version for warning
 suppression

---
 .../modules/gfx/include/nostalgia/gfx/tilesheet.hpp       | 4 ++--
 src/nostalgia/modules/gfx/src/tilesheet.cpp               | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/nostalgia/modules/gfx/include/nostalgia/gfx/tilesheet.hpp b/src/nostalgia/modules/gfx/include/nostalgia/gfx/tilesheet.hpp
index fad20047..8a6bdabb 100644
--- a/src/nostalgia/modules/gfx/include/nostalgia/gfx/tilesheet.hpp
+++ b/src/nostalgia/modules/gfx/include/nostalgia/gfx/tilesheet.hpp
@@ -449,7 +449,7 @@ TileSheet::SubSheet &getSubSheet(
 		std::size_t idxIt,
 		TileSheet::SubSheet &pSubsheet) noexcept;
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && __GNUC__ >= 14
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdangling-reference"
 #endif
@@ -458,7 +458,7 @@ TileSheet::SubSheet const&getSubSheet(TileSheet const&ts, ox::SpanView<uint32_t>
 
 [[nodiscard]]
 TileSheet::SubSheet &getSubSheet(TileSheet &ts, ox::SpanView<uint32_t> const &idx) noexcept;
-#ifdef __GNUC__
+#if defined(__GNUC__) && __GNUC__ >= 14
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/src/nostalgia/modules/gfx/src/tilesheet.cpp b/src/nostalgia/modules/gfx/src/tilesheet.cpp
index d17f2d99..c67bcf13 100644
--- a/src/nostalgia/modules/gfx/src/tilesheet.cpp
+++ b/src/nostalgia/modules/gfx/src/tilesheet.cpp
@@ -187,7 +187,7 @@ TileSheet::SubSheetIdx validateSubSheetIdx(TileSheet const&ts, TileSheet::SubShe
 	return validateSubSheetIdx(std::move(idx), 0, ts.subsheet);
 }
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && __GNUC__ >= 14
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdangling-reference"
 #endif
@@ -204,7 +204,7 @@ static TileSheet::SubSheet const&getSubSheet(
 	}
 	return getSubSheet(idx, idxIt + 1, pSubsheet.subsheets[currentIdx]);
 }
-#ifdef __GNUC__
+#if defined(__GNUC__) && __GNUC__ >= 14
 #pragma GCC diagnostic pop
 #endif
 
@@ -218,7 +218,7 @@ TileSheet::SubSheet &getSubSheet(
 	return getSubSheet(idx, idxIt + 1, pSubsheet.subsheets[idx[idxIt]]);
 }
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && __GNUC__ >= 14
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdangling-reference"
 #endif
@@ -229,7 +229,7 @@ TileSheet::SubSheet const&getSubSheet(TileSheet const &ts, ox::SpanView<uint32_t
 TileSheet::SubSheet &getSubSheet(TileSheet &ts, ox::SpanView<uint32_t> const &idx) noexcept {
 	return gfx::getSubSheet(idx, 0, ts.subsheet);
 }
-#ifdef __GNUC__
+#if defined(__GNUC__) && __GNUC__ >= 14
 #pragma GCC diagnostic pop
 #endif