diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 27a6fcae9..14ca8098a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,11 +8,11 @@ jobs: strategy: matrix: - os: [macos-latest, ubuntu-20.04, ubuntu-22.04] + os: [macos-latest, ubuntu-22.04, ubuntu-24.04] crypto: [auto] include: - crypto: nettle - os: ubuntu-20.04 + os: ubuntu-22.04 steps: @@ -24,7 +24,11 @@ jobs: - name: "setup macos build environment" if: ${{ startsWith(matrix.os, 'macos') }} - run: brew install protobuf automake + run: | + brew install protobuf automake + F=$(pkg-config --cflags protobuf | sed 's/-I\/opt\/homebrew/-isystem \/opt\/homebrew/g') + echo "protobuf_CFLAGS=$F" >> $GITHUB_ENV + - name: "generate build scripts" run: ./autogen.sh diff --git a/src/terminal/terminalframebuffer.h b/src/terminal/terminalframebuffer.h index 9039d4e7f..075be53d7 100644 --- a/src/terminal/terminalframebuffer.h +++ b/src/terminal/terminalframebuffer.h @@ -428,7 +428,7 @@ class Framebuffer row = ds.get_cursor_row(); row_pointer& mutable_row = rows.at( row ); // If the row is shared, copy it. - if ( !mutable_row.unique() ) { + if ( mutable_row.use_count() > 1 ) { mutable_row = std::make_shared( *mutable_row ); } return mutable_row.get();