Skip to content

Commit 4e0a888

Browse files
committed
Sync from upstream.
2 parents 814ed9f + 5d68c9c commit 4e0a888

2 files changed

Lines changed: 36 additions & 17 deletions

File tree

.github/workflows/ci.yml

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,52 +18,71 @@ jobs:
1818
matrix:
1919
include:
2020
- toolset: gcc-4.8
21-
os: ubuntu-latest
22-
container: ubuntu:18.04
2321
cxxstd: 11
22+
container: ubuntu:18.04
23+
os: ubuntu-latest
2424
install: g++-4.8
2525
- toolset: gcc-5
2626
cxxstd: 11
27-
os: ubuntu-latest
2827
container: ubuntu:18.04
28+
os: ubuntu-latest
2929
install: g++-5
3030
- toolset: gcc-7
31-
os: ubuntu-20.04
32-
install: g++-7
31+
container: ubuntu:18.04
32+
os: ubuntu-latest
3333
- toolset: gcc-9
34-
os: ubuntu-20.04
34+
container: ubuntu:20.04
35+
os: ubuntu-latest
3536
- toolset: gcc-11
3637
os: ubuntu-22.04
38+
- toolset: gcc-13
39+
os: ubuntu-24.04
40+
- toolset: clang
41+
container: ubuntu:20.04
42+
os: ubuntu-latest
43+
install: clang
3744
- toolset: clang
38-
compiler: clang++-15
39-
cxxstd: 20
4045
os: ubuntu-22.04
41-
install: clang-15
4246
- toolset: clang
43-
os: macos-11
47+
cxxstd: 20
48+
os: ubuntu-24.04
49+
- toolset: clang
50+
os: macos-13
4451
cxxstd: 11
4552
- toolset: clang
46-
os: macos-12
53+
os: macos-14
4754
cxxstd: 14
4855
- toolset: clang
49-
os: macos-13
56+
os: macos-15
5057
cxxstd: 17
5158

5259
runs-on: ${{matrix.os}}
53-
container: ${{matrix.container}}
60+
61+
container:
62+
image: ${{matrix.container}}
63+
volumes:
64+
- /node20217:/node20217:rw,rshared
65+
- ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}
5466

5567
defaults:
5668
run:
5769
shell: bash
5870

5971
steps:
60-
- uses: actions/checkout@v3
61-
6272
- name: Setup container environment
6373
if: matrix.container
6474
run: |
6575
apt-get update
66-
apt-get -y install sudo python3 git g++
76+
apt-get -y install sudo python3 git g++ curl xz-utils
77+
78+
- name: Install nodejs20glibc2.17
79+
if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }}
80+
run: |
81+
curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz
82+
tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
83+
ldd /__e/node20/bin/node
84+
85+
- uses: actions/checkout@v4
6786

6887
- name: Install packages
6988
if: matrix.install

include/boost/thread/future.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4668,7 +4668,7 @@ namespace detail
46684668
}
46694669
run_it& operator=(BOOST_THREAD_RV_REF(run_it) x) BOOST_NOEXCEPT {
46704670
if (this != &x) {
4671-
that_=x.that;
4671+
that_=x.that_;
46724672
x.that_.reset();
46734673
}
46744674
return *this;

0 commit comments

Comments
 (0)