From 2fcda7a829c6f615c0b35504f1b0d36813c28020 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Sun, 1 Sep 2024 19:06:50 -0400 Subject: [PATCH] Work around compiler changes Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com> --- .github/workflows/build.yml | 14 +++++++------- .github/workflows/conda.yml | 2 +- .github/workflows/wiki-lint.yml | 2 +- cpp/csp/core/Enum.h | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2fa3d75e..3b60502b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: # github.event.head_commit.message otherwise on pull # requests) initialize: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 outputs: COMMIT_MESSAGE: ${{ steps.setup.outputs.COMMIT_MSG }} @@ -130,7 +130,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 python-version: - 3.9 @@ -173,7 +173,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md + - ubuntu-24.04 # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md - macos-12 # https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md - macos-14 # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md - windows-2019 # https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md @@ -385,7 +385,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 python-version: - 3.9 @@ -438,7 +438,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 - macos-12 - macos-14 - windows-2019 @@ -592,7 +592,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 python-version: - 3.9 @@ -765,7 +765,7 @@ jobs: - test_dependencies if: startsWith(github.ref, 'refs/tags/v') - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Download wheels and sdist diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index c64fdb23..90364730 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -32,7 +32,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 - macos-14 - macos-12 - windows-2019 diff --git a/.github/workflows/wiki-lint.yml b/.github/workflows/wiki-lint.yml index 39c0b859..c6226546 100644 --- a/.github/workflows/wiki-lint.yml +++ b/.github/workflows/wiki-lint.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 python-version: - 3.9 diff --git a/cpp/csp/core/Enum.h b/cpp/csp/core/Enum.h index d6dac5ee..aac11fd5 100644 --- a/cpp/csp/core/Enum.h +++ b/cpp/csp/core/Enum.h @@ -110,8 +110,8 @@ struct Enum : public EnumTraits iterator( int v ) : m_v( v ) {} Enum operator*() { return Enum( ( EnumV ) m_v ); } - bool operator==(const iterator &rhs) { return m_v == rhs.m_v; } - bool operator!=(const iterator &rhs) { return !(*this == rhs); } + bool operator==(const iterator &rhs) const { return m_v == rhs.m_v; } + bool operator!=(const iterator &rhs) const { return !(*this == rhs); } iterator &operator++() { ++m_v;