File tree Expand file tree Collapse file tree 4 files changed +18
-14
lines changed
third_party/sol2/include/sol Expand file tree Collapse file tree 4 files changed +18
-14
lines changed Original file line number Diff line number Diff line change @@ -446,14 +446,14 @@ jobs:
446
446
if : steps.cache-boost.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ENABLE_CONAN != 'ON'
447
447
run : |
448
448
BOOST_VERSION="1.85.0"
449
- BOOST_VERSION_UNDERSCORE ="${BOOST_VERSION//./_} "
450
- wget -q https://boostorg.jfrog.io/artifactory/main/release/ ${BOOST_VERSION}/source/boost_${BOOST_VERSION_UNDERSCORE }.tar.gz
451
- tar xzf boost_${BOOST_VERSION_UNDERSCORE }.tar.gz
452
- cd boost_${BOOST_VERSION_UNDERSCORE }
449
+ BOOST_VERSION_FLAVOR ="${BOOST_VERSION}-b2-nodocs "
450
+ wget -q https://github.com/boostorg/boost/releases/download/boost- ${BOOST_VERSION}/boost-${BOOST_VERSION_FLAVOR }.tar.gz
451
+ tar xzf boost-${BOOST_VERSION_FLAVOR }.tar.gz
452
+ cd boost-${BOOST_VERSION }
453
453
sudo ./bootstrap.sh
454
454
sudo ./b2 install
455
455
cd ..
456
- sudo rm -rf boost_${BOOST_VERSION_UNDERSCORE }*
456
+ sudo rm -rf boost-${BOOST_VERSION }*
457
457
458
458
- name : Install dev dependencies
459
459
run : |
Original file line number Diff line number Diff line change @@ -56,6 +56,9 @@ endif()
56
56
if (POLICY CMP0074 )
57
57
cmake_policy (SET CMP0074 NEW )
58
58
endif ()
59
+ if (POLICY CMP0167 )
60
+ cmake_policy (SET CMP0167 NEW )
61
+ endif ()
59
62
project (OSRM C CXX )
60
63
61
64
Original file line number Diff line number Diff line change 1
- FROM alpine:3.20.5 AS alpine-mimalloc
1
+ FROM alpine:3.21.2 AS alpine-mimalloc
2
2
3
- RUN apk add --no-cache mimalloc
3
+ RUN apk update && \
4
+ apk upgrade && \
5
+ apk add --no-cache \
6
+ boost-iostreams \
7
+ boost-program_options \
8
+ boost-thread \
9
+ mimalloc
4
10
5
11
ENV LD_PRELOAD=/usr/lib/libmimalloc.so.2
6
12
ENV MIMALLOC_LARGE_OS_PAGES=1
@@ -14,9 +20,6 @@ RUN mkdir -p /src /opt && \
14
20
apk add --no-cache \
15
21
boost-dev \
16
22
boost-filesystem \
17
- boost-iostreams \
18
- boost-program_options \
19
- boost-thread \
20
23
clang \
21
24
cmake \
22
25
expat-dev \
@@ -59,9 +62,6 @@ COPY --from=builder /opt /opt
59
62
60
63
RUN apk add --no-cache \
61
64
boost-date_time \
62
- boost-iostreams \
63
- boost-program_options \
64
- boost-thread \
65
65
expat \
66
66
lua5.4 \
67
67
onetbb && \
Original file line number Diff line number Diff line change @@ -6752,7 +6752,8 @@ namespace sol {
6752
6752
static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
6753
6753
6754
6754
*this = nullopt;
6755
- this->construct(std::forward<Args>(args)...);
6755
+ new (static_cast<void*>(this)) optional(std::in_place, std::forward<Args>(args)...);
6756
+ return **this;
6756
6757
}
6757
6758
6758
6759
/// Swaps this optional with the other.
You can’t perform that action at this time.
0 commit comments