Support GCC 11

This commit is contained in:
Dan Paulat 2023-04-20 00:27:32 -05:00
parent 97035e5596
commit 57e9069f0a
6 changed files with 10 additions and 9 deletions

View file

@ -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 }}

View file

@ -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+

View file

@ -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)
{

View file

@ -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)
{

View file

@ -4,6 +4,7 @@
#include <scwx/util/logger.hpp>
#include <fstream>
#include <sstream>
#if defined(_MSC_VER)
# pragma warning(push)

View file

@ -3,6 +3,7 @@
#include <scwx/util/rangebuf.hpp>
#include <istream>
#include <sstream>
#include <string>
#if defined(__GNUC__)