Skip to content

Commit 8b25c17

Browse files
committed
Yet more GA fixes.
1 parent 2a83a87 commit 8b25c17

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

.ci.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ endif()
2121
ctest_test(RETURN_VALUE retval)
2222
set(retval2 0)
2323
set(retval3 0)
24-
if(("$ENV{CXX}" MATCHES "g\\+\\+"))
24+
if(("$ENV{CXX}" MATCHES "clang"))
2525
ctest_build(TARGET _hl-asan)
2626
set(CTEST_CONFIGURATION_TYPE "asan")
2727
ctest_test(RETURN_VALUE retval2)

.github/workflows/unittests_linux.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
compiler: [clang++, g++, libc++]
19+
compiler: [clang++-19, g++, libc++]
2020
env:
2121
NAME: Linux-${{ matrix.compiler }}
2222
CXX: ${{ matrix.compiler }}
@@ -34,6 +34,12 @@ jobs:
3434
sudo apt install clang-19 libc++-19-dev libc++abi-19-dev libomp-19-dev;
3535
export CMAKE_CONFIGURE_OPTIONS="-DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-linux-libc++.cmake";
3636
ctest -S .ci.cmake -VV -E noexcept --timeout 900 "-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS";
37+
elif [ "${{ matrix.compiler }}" = "clang++-19" ]; then
38+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -;
39+
sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main";
40+
sudo apt update;
41+
sudo apt install clang-19 libc++-19-dev libc++abi-19-dev libomp-19-dev;
42+
ctest -S .ci.cmake -VV --timeout 900 "-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS";
3743
else
3844
ctest -S .ci.cmake -VV --timeout 900 "-DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS";
3945
fi

doc/src/snippets/c_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,4 @@ extern CXX_RESULT_SYSTEM(to_string_rettype) _Z9to_stringPcmi(char *buffer, size_
9292
ret.flags |= 1U;
9393
ret.value = len;
9494
return ret;
95-
}
95+
}

doc/src/snippets/constructors.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Example of Outcome used with constructors
2-
(C) 2017-2019 Niall Douglas <http://www.nedproductions.biz/> (5 commits)
2+
(C) 2017-2025 Niall Douglas <http://www.nedproductions.biz/> (5 commits)
33
44
55
Licensed under the Apache License, Version 2.0 (the "License");
@@ -77,7 +77,11 @@ class file_handle
7777

7878
// Moves but not copies permitted
7979
file_handle(const file_handle &) = delete;
80-
file_handle(file_handle &&o) noexcept : _fd(o._fd) { o._fd = -1; }
80+
file_handle(file_handle &&o) noexcept
81+
: _fd(o._fd)
82+
{
83+
o._fd = -1;
84+
}
8185
file_handle &operator=(const file_handle &) = delete;
8286
file_handle &operator=(file_handle &&o) noexcept
8387
{
@@ -130,7 +134,7 @@ inline outcome::result<file_handle> file_handle::file(file_handle::path_type pat
130134
default:
131135
return std::errc::invalid_argument;
132136
}
133-
ret._fd = ::open(path.u8string().c_str(), flags);
137+
ret._fd = ::open((const char *) path.u8string().c_str(), flags);
134138
if(-1 == ret._fd)
135139
{
136140
// Note that if we bail out here, ~file_handle() will correctly not call ::close()

0 commit comments

Comments
 (0)