From fd185282788f66bbc621a24c1b2e0c5f53eac77f Mon Sep 17 00:00:00 2001 From: David Chisnall Date: Tue, 7 Sep 2021 08:44:47 +0100 Subject: [PATCH] Add missing `inline` from header. (#388) --- .github/workflows/main.yml | 8 ++++++-- src/mem/metaslab.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 157ea9e..bed0e70 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,9 +28,13 @@ jobs: - os: "ubuntu-latest" dependencies: "sudo apt install ninja-build" - os: "macos-11" - dependencies: "brew update && brew install ninja" + # The homebrew packages are broken at the moment and error out + # after trying to install Python as a dependency of ninja because + # 2to3 exists. As a quick hack, delete it first. This should be + # removed once the homebrew install is fixed. + dependencies: "rm -f /usr/local/bin/2to3 ; brew update && brew install ninja" - os: "macos-10.15" - dependencies: "brew update && brew install ninja" + dependencies: "rm -f /usr/local/bin/2to3 ; brew update && brew install ninja" # Skip the tests for the FreeBSD release builds - os: "freebsd-13.0" build-type: Release diff --git a/src/mem/metaslab.h b/src/mem/metaslab.h index 56499ec..6212faa 100644 --- a/src/mem/metaslab.h +++ b/src/mem/metaslab.h @@ -169,7 +169,7 @@ namespace snmalloc } }; - Metaslab* Metaslab::from_link(SlabLink* lptr) + inline Metaslab* Metaslab::from_link(SlabLink* lptr) { return pointer_offset_signed( lptr, -static_cast(offsetof(Metaslab, link)));