From 57e9069f0a8b17739e65a359bcc75dc45f87e1ef Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Thu, 20 Apr 2023 00:27:32 -0500
Subject: [PATCH] Support GCC 11

---
 .github/workflows/ci.yml                                  | 7 ++++---
 README.md                                                 | 5 ++---
 wxdata/source/scwx/provider/aws_level2_data_provider.cpp  | 2 +-
 wxdata/source/scwx/provider/aws_level3_data_provider.cpp  | 3 +--
 wxdata/source/scwx/wsr88d/level3_file.cpp                 | 1 +
 wxdata/source/scwx/wsr88d/rpg/graphic_product_message.cpp | 1 +
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e7b02edb..a5794c2f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,18 +40,19 @@ jobs:
           - name: linux64_gcc
             os: ubuntu-22.04
             build_type: Release
-            env_cc: gcc-12
-            env_cxx: g++-12
+            env_cc: gcc-11
+            env_cxx: g++-11
             compiler: gcc
             qt_version: 6.4.2
             qt_arch: gcc_64
             qt_tools: ''
             conan_arch: x86_64
             conan_compiler: gcc
-            conan_compiler_version: 12
+            conan_compiler_version: 11
             conan_compiler_runtime: ''
             conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True
             artifact_suffix: linux-x64
+    name: ${{ matrix.name }}
     env:
       CC: ${{ matrix.env_cc }}
       CXX: ${{ matrix.env_cxx }}
diff --git a/README.md b/README.md
index cbca0fde..13be2e3f 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,5 @@ Supercell Wx supports the following 64-bit operating systems:
 - Windows 11
 - Linux
   - Ubuntu 22.04+
-  - Red Hat 8.4+
-  - openSUSE 15.4+
-  - Similar environments may be compatible
+  - Fedora Linux 34+
+  - Most distributions supporting the GCC Standard C++ Library 11+
diff --git a/wxdata/source/scwx/provider/aws_level2_data_provider.cpp b/wxdata/source/scwx/provider/aws_level2_data_provider.cpp
index 56d4ea7a..53b0f85f 100644
--- a/wxdata/source/scwx/provider/aws_level2_data_provider.cpp
+++ b/wxdata/source/scwx/provider/aws_level2_data_provider.cpp
@@ -71,7 +71,7 @@ AwsLevel2DataProvider::GetTimePointFromKey(const std::string& key)
       (lastSeparator == std::string::npos) ? 0 : lastSeparator + 5;
 
    // Filename format is GGGGYYYYMMDD_TTTTTT(_V##).gz
-   static constexpr size_t formatSize = std::string("YYYYMMDD_TTTTTT").size();
+   static const size_t formatSize = std::string("YYYYMMDD_TTTTTT").size();
 
    if (key.size() >= offset + formatSize)
    {
diff --git a/wxdata/source/scwx/provider/aws_level3_data_provider.cpp b/wxdata/source/scwx/provider/aws_level3_data_provider.cpp
index 88c28c93..327f4c9f 100644
--- a/wxdata/source/scwx/provider/aws_level3_data_provider.cpp
+++ b/wxdata/source/scwx/provider/aws_level3_data_provider.cpp
@@ -96,8 +96,7 @@ AwsLevel3DataProvider::GetTimePointFromKey(const std::string& key)
    constexpr size_t offset = 8;
 
    // Filename format is GGG_PPP_YYYY_MM_DD_HH_MM_SS
-   static constexpr size_t formatSize =
-      std::string("YYYY_MM_DD_HH_MM_SS").size();
+   static const size_t formatSize = std::string("YYYY_MM_DD_HH_MM_SS").size();
 
    if (key.size() >= offset + formatSize)
    {
diff --git a/wxdata/source/scwx/wsr88d/level3_file.cpp b/wxdata/source/scwx/wsr88d/level3_file.cpp
index f51af72e..958fcbd4 100644
--- a/wxdata/source/scwx/wsr88d/level3_file.cpp
+++ b/wxdata/source/scwx/wsr88d/level3_file.cpp
@@ -4,6 +4,7 @@
 #include <scwx/util/logger.hpp>
 
 #include <fstream>
+#include <sstream>
 
 #if defined(_MSC_VER)
 #   pragma warning(push)
diff --git a/wxdata/source/scwx/wsr88d/rpg/graphic_product_message.cpp b/wxdata/source/scwx/wsr88d/rpg/graphic_product_message.cpp
index d189aed4..29bbd21f 100644
--- a/wxdata/source/scwx/wsr88d/rpg/graphic_product_message.cpp
+++ b/wxdata/source/scwx/wsr88d/rpg/graphic_product_message.cpp
@@ -3,6 +3,7 @@
 #include <scwx/util/rangebuf.hpp>
 
 #include <istream>
+#include <sstream>
 #include <string>
 
 #if defined(__GNUC__)