Remove use of SUPPRESS_UNUSED

- Use `constexpr` instead of `const`
- Use `[[maybe_unused]]` where applicable
- Remove includes
- Also shorten array-types to use CTAD instead of specifying the template params explicitely

Author: Flamefire

cpp.hint

@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks <sf-team at siedler25.org>
+// Copyright (C) 2005 - 2026 Settlers Freaks <sf-team at siedler25.org>
 //
 // SPDX-License-Identifier: BSL-1.0
 
@@ -15,5 +15,4 @@
 #define BOOST_REQUIRE_GT(x,y) BOOST_REQUIRE((x) > (y))
 
 #define RTTR_FOREACH_PT(PtType, size) for(PtType pt;;)
-#define SUPPRESS_UNUSED
 #define RTTR_Assert(cond) assert(cond)

external/libutil

@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2025 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -25,7 +25,7 @@ class OptionalEnum
     using value_type = T;
 
     constexpr OptionalEnum() noexcept = default;
-    OptionalEnum(std::nullopt_t) noexcept {}
+    constexpr OptionalEnum(std::nullopt_t) noexcept {}
     constexpr OptionalEnum(const T& value) noexcept : value_(static_cast<underlying_type>(value)) {}
     constexpr OptionalEnum& operator=(const T& value) noexcept
     {

external/s25update

@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -7,7 +7,7 @@
 #include "AddonList.h"
 #include <boost/format.hpp>
 
-const std::array<unsigned, 4> SUPPRESS_UNUSED signDurabilityFactor = {{1, 2, 4, 10}};
+constexpr std::array signDurabilityFactor{1u, 2u, 4u, 10u};
 
 /**
  *  Addon makes resource signs stay visible longer than normal

libs/common/include/helpers/OptionalEnum.h

@@ -1,15 +1,14 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #include "AddonList.h"
 #include "mygettext/mygettext.h"
-#include "s25util/warningSuppression.h"
 #include <array>
 
-const std::array<unsigned, 6> SUPPRESS_UNUSED waterwayLengths = {{3, 5, 9, 13, 21, 0}};
+inline constexpr std::array waterwayLengths{3u, 5u, 9u, 13u, 21u, 0u};
 
 /**
  *  Addon for changing the maximum length of waterways.

libs/s25main/addons/AddonDurableGeologistSigns.h

@@ -1,11 +1,10 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #include "helpers/EnumArray.h"
-#include "s25util/warningSuppression.h"
 
 // Note: This enums are constructed for performance and easy conversion.
 // AIResource must be contiguous and it is assumed that only valid enumerators are used
@@ -86,7 +85,7 @@ constexpr bool operator==(AINodeResource lhs, AIResource rhs) noexcept
     return lhs == convertToNodeResource(rhs);
 }
 
-constexpr helpers::EnumArray<unsigned, AIResource> SUPPRESS_UNUSED RES_RADIUS = {
+constexpr helpers::EnumArray<unsigned, AIResource> RES_RADIUS = {
   2, // Gold
   2, // Ironore
   2, // Coal

libs/s25main/addons/AddonMaxWaterwayLength.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -13,7 +13,6 @@
 #include "mygettext/mygettext.h"
 #include "s25util/Log.h"
 #include "s25util/error.h"
-#include "s25util/warningSuppression.h"
 #include <array>
 
 namespace dll = boost::dll;

libs/s25main/ai/AIResource.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -13,13 +13,13 @@
 
 extern const helpers::EnumArray<const char*, BuildingType> BUILDING_NAMES;
 
-constexpr helpers::EnumArray<BuildingCost, BuildingType> SUPPRESS_UNUSED BUILDING_COSTS = {
+constexpr helpers::EnumArray<BuildingCost, BuildingType> BUILDING_COSTS = {
   {{0, 0}, {2, 0}, {2, 3}, {2, 0}, {3, 5}, {4, 4}, {2, 3}, {4, 7}, {2, 2}, {4, 7}, {4, 0}, {4, 0}, {4, 0}, {4, 0},
    {4, 0}, {2, 2}, {4, 2}, {2, 0}, {2, 0}, {2, 0}, {2, 0}, {2, 2}, {2, 0}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {4, 3},
    {3, 3}, {4, 3}, {0, 0}, {2, 2}, {2, 2}, {2, 2}, {2, 2}, {2, 0}, {2, 3}, {3, 3}, {3, 3}, {4, 6}}};
 
 // Bauqualitäten der Gebäude
-constexpr helpers::EnumArray<BuildingQuality, BuildingType> SUPPRESS_UNUSED BUILDING_SIZE = {
+constexpr helpers::EnumArray<BuildingQuality, BuildingType> BUILDING_SIZE = {
   {BuildingQuality::Castle, BuildingQuality::Hut,    BuildingQuality::Hut,     BuildingQuality::Hut,
    BuildingQuality::House,  BuildingQuality::Castle, BuildingQuality::House,   BuildingQuality::Castle,
    BuildingQuality::House,  BuildingQuality::Castle, BuildingQuality::Mine,    BuildingQuality::Mine,
@@ -31,7 +31,7 @@ constexpr helpers::EnumArray<BuildingQuality, BuildingType> SUPPRESS_UNUSED BUIL
    BuildingQuality::House,  BuildingQuality::House,  BuildingQuality::House,   BuildingQuality::Hut,
    BuildingQuality::House,  BuildingQuality::Castle, BuildingQuality::Castle,  BuildingQuality::Harbor}};
 
-const helpers::EnumArray<BldWorkDescription, BuildingType> SUPPRESS_UNUSED BLD_WORK_DESC = {{
+constexpr helpers::EnumArray<BldWorkDescription, BuildingType> BLD_WORK_DESC = {{
   {}, // HQ
   {Job::Private, std::nullopt, WaresNeeded(GoodType::Coins), 1},
   {Job::Private, std::nullopt, WaresNeeded(GoodType::Coins), 2},
@@ -78,7 +78,7 @@ const helpers::EnumArray<BldWorkDescription, BuildingType> SUPPRESS_UNUSED BLD_W
 extern const helpers::MultiEnumArray<SmokeConst, Nation, BuildingType> BUILDING_SMOKE_CONSTS;
 
 /// Offset of the production-/gold- stop signs per building
-constexpr helpers::MultiEnumArray<DrawPoint, Nation, BuildingType> SUPPRESS_UNUSED BUILDING_SIGN_CONSTS = {
+constexpr helpers::MultiEnumArray<DrawPoint, Nation, BuildingType> BUILDING_SIGN_CONSTS = {
   {// Nubier
    {{{0, 0},    {19, -4},  {19, -3},  {-14, -1}, {23, -19}, {22, -7},  {-8, -10}, {9, -24},   {-16, -10}, {29, -23},
      {-2, -15}, {2, -13},  {-5, -16}, {-5, -15}, {0, 0},    {22, -6},  {0, 0},    {4, -16},   {9, -12},   {7, -10},
@@ -110,7 +110,7 @@ extern const helpers::MultiEnumArray<DrawPoint, Nation, BuildingType> BUILDING_A
 
 /// Position der nubischen Feuer für alle 4 Bergwerke
 /// (Granit, Kohle, Eisen, Gold)
-constexpr std::array<DrawPoint, 4> SUPPRESS_UNUSED NUBIAN_MINE_FIRE = {{
+constexpr std::array<DrawPoint, 4> NUBIAN_MINE_FIRE = {{
   {31, -18},
   {34, -10},
   {30, -11},

libs/s25main/drivers/DriverWrapper.cpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2005 - 2025 Settlers Freaks (sf-team at siedler25.org)
+// Copyright (C) 2005 - 2026 Settlers Freaks (sf-team at siedler25.org)
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -12,8 +12,7 @@
 
 using namespace std::chrono_literals;
 /// Length of GameFrames for each speed level
-constexpr helpers::EnumArray<std::chrono::duration<unsigned, std::milli>, GameSpeed> SUPPRESS_UNUSED
-  SPEED_GF_LENGTHS = {{80ms, 60ms, 50ms, 40ms, 30ms}};
+constexpr helpers::EnumArray<std::chrono::milliseconds, GameSpeed> SPEED_GF_LENGTHS = {{80ms, 60ms, 50ms, 40ms, 30ms}};
 constexpr auto MAX_SPEED = 10ms;
 constexpr auto MIN_SPEED = SPEED_GF_LENGTHS[GameSpeed::VerySlow];
 /// Max/Max speed for debug mode (includes replays)
@@ -29,7 +28,7 @@ constexpr auto REFERENCE_SPEED = SPEED_GF_LENGTHS[GameSpeed::Normal];
 template<class Rep, class Period>
 constexpr auto duration_to_gfs(const std::chrono::duration<Rep, Period> d)
 {
-    return d / REFERENCE_SPEED;
+    return static_cast<unsigned>(d / REFERENCE_SPEED);
 }
 
 /// Get normalized duration for the given number of game frames
@@ -44,8 +43,8 @@ constexpr unsigned MINER_RADIUS = 2;
 /// Konstante für die Pfadrichtung bei einer Schiffsverbindung
 constexpr unsigned char SHIP_DIR = 100;
 constexpr unsigned char INVALID_DIR = 0xFF;
-constexpr unsigned SUPPRESS_UNUSED NO_MAX_LEN = std::numeric_limits<unsigned>::max();
+constexpr auto NO_MAX_LEN = std::numeric_limits<unsigned>::max();
 
 /// tournament modes
-constexpr std::array SUPPRESS_UNUSED TOURNAMENT_MODES_DURATION{30min, 60min, 90min, 120min, 240min};
+constexpr std::array TOURNAMENT_MODES_DURATION{30min, 60min, 90min, 120min, 240min};
 static_assert(TOURNAMENT_MODES_DURATION.size() == NUM_TOURNAMENT_MODES);