mirror of
https://github.com/ciphervance/supercell-wx.git
synced 2025-10-30 18:40:05 +00:00
Support GCC 11
This commit is contained in:
parent
97035e5596
commit
57e9069f0a
6 changed files with 10 additions and 9 deletions
7
.github/workflows/ci.yml
vendored
7
.github/workflows/ci.yml
vendored
|
|
@ -40,18 +40,19 @@ jobs:
|
||||||
- name: linux64_gcc
|
- name: linux64_gcc
|
||||||
os: ubuntu-22.04
|
os: ubuntu-22.04
|
||||||
build_type: Release
|
build_type: Release
|
||||||
env_cc: gcc-12
|
env_cc: gcc-11
|
||||||
env_cxx: g++-12
|
env_cxx: g++-11
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
qt_version: 6.4.2
|
qt_version: 6.4.2
|
||||||
qt_arch: gcc_64
|
qt_arch: gcc_64
|
||||||
qt_tools: ''
|
qt_tools: ''
|
||||||
conan_arch: x86_64
|
conan_arch: x86_64
|
||||||
conan_compiler: gcc
|
conan_compiler: gcc
|
||||||
conan_compiler_version: 12
|
conan_compiler_version: 11
|
||||||
conan_compiler_runtime: ''
|
conan_compiler_runtime: ''
|
||||||
conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True
|
conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True
|
||||||
artifact_suffix: linux-x64
|
artifact_suffix: linux-x64
|
||||||
|
name: ${{ matrix.name }}
|
||||||
env:
|
env:
|
||||||
CC: ${{ matrix.env_cc }}
|
CC: ${{ matrix.env_cc }}
|
||||||
CXX: ${{ matrix.env_cxx }}
|
CXX: ${{ matrix.env_cxx }}
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,5 @@ Supercell Wx supports the following 64-bit operating systems:
|
||||||
- Windows 11
|
- Windows 11
|
||||||
- Linux
|
- Linux
|
||||||
- Ubuntu 22.04+
|
- Ubuntu 22.04+
|
||||||
- Red Hat 8.4+
|
- Fedora Linux 34+
|
||||||
- openSUSE 15.4+
|
- Most distributions supporting the GCC Standard C++ Library 11+
|
||||||
- Similar environments may be compatible
|
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ AwsLevel2DataProvider::GetTimePointFromKey(const std::string& key)
|
||||||
(lastSeparator == std::string::npos) ? 0 : lastSeparator + 5;
|
(lastSeparator == std::string::npos) ? 0 : lastSeparator + 5;
|
||||||
|
|
||||||
// Filename format is GGGGYYYYMMDD_TTTTTT(_V##).gz
|
// 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)
|
if (key.size() >= offset + formatSize)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -96,8 +96,7 @@ AwsLevel3DataProvider::GetTimePointFromKey(const std::string& key)
|
||||||
constexpr size_t offset = 8;
|
constexpr size_t offset = 8;
|
||||||
|
|
||||||
// Filename format is GGG_PPP_YYYY_MM_DD_HH_MM_SS
|
// Filename format is GGG_PPP_YYYY_MM_DD_HH_MM_SS
|
||||||
static constexpr size_t formatSize =
|
static const size_t formatSize = std::string("YYYY_MM_DD_HH_MM_SS").size();
|
||||||
std::string("YYYY_MM_DD_HH_MM_SS").size();
|
|
||||||
|
|
||||||
if (key.size() >= offset + formatSize)
|
if (key.size() >= offset + formatSize)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
#include <scwx/util/logger.hpp>
|
#include <scwx/util/logger.hpp>
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
#include <sstream>
|
||||||
|
|
||||||
#if defined(_MSC_VER)
|
#if defined(_MSC_VER)
|
||||||
# pragma warning(push)
|
# pragma warning(push)
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
#include <scwx/util/rangebuf.hpp>
|
#include <scwx/util/rangebuf.hpp>
|
||||||
|
|
||||||
#include <istream>
|
#include <istream>
|
||||||
|
#include <sstream>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#if defined(__GNUC__)
|
#if defined(__GNUC__)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue