fix: gcc13 compile issues, fixes #557

This commit is contained in:
Nicholas Dudfield
2025-07-30 09:45:43 +00:00
parent 849d447a20
commit 1255ea7a01
4 changed files with 7 additions and 7 deletions

View File

@@ -59,7 +59,6 @@ runs:
${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ inputs.configuration }}-${{ inputs.main_branch }}
${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ inputs.configuration }}-
${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-
${{ runner.os }}-ccache-v${{ inputs.cache_version }}-
- name: Configure project
shell: bash

View File

@@ -22,9 +22,9 @@ jobs:
configuration: [Debug]
include:
- compiler: gcc
cc: gcc-11
cxx: g++-11
compiler_id: gcc-11
cc: gcc-13
cxx: g++-13
compiler_id: gcc-13
env:
build_dir: .build
# Bump this number to invalidate all caches globally.
@@ -60,7 +60,7 @@ jobs:
# Set correct compiler version based on matrix.compiler
if [ "${{ matrix.compiler }}" = "gcc" ]; then
conan profile update settings.compiler.version=11 default
conan profile update settings.compiler.version=13 default
elif [ "${{ matrix.compiler }}" = "clang" ]; then
conan profile update settings.compiler.version=14 default
fi
@@ -120,4 +120,4 @@ jobs:
else
echo "Error: rippled executable not found in ${{ env.build_dir }}"
exit 1
fi
fi

View File

@@ -1,3 +1,4 @@
#include <cstdint>
#include <map>
#include <set>
#include <string>

View File

@@ -321,7 +321,7 @@ public:
HSFEE,
ter(temMALFORMED));
env(ripple::test::jtx::hook(alice, {{}}, 0),
env(ripple::test::jtx::hook(alice, std::vector<Json::Value>{}, 0),
M("Must have a non-empty hooks field"),
HSFEE,
ter(temMALFORMED));