Skip to content

Commit b4bd8dd

Browse files
committed
Fix clang and gcc build errors, upgrade gcc
1 parent 14e3d68 commit b4bd8dd

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- ubuntu-22.04
3333
compiler:
3434
# you can specify the version after `-` like "llvm-16.0.0".
35-
- gcc-13
35+
- gcc-14
3636
generator:
3737
- "Ninja Multi-Config"
3838
build_type:
@@ -45,7 +45,7 @@ jobs:
4545
include:
4646
# Add appropriate variables for gcov version required. This will intentionally break
4747
# if you try to use a compiler that does not have gcov set
48-
- compiler: gcc-13
48+
- compiler: gcc-14
4949
gcov_executable: gcov
5050
enable_ipo: On
5151

examples/speed_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ auto evaluate(std::string_view input)
1919

2020
template<typename Result> Result evaluate_to(std::string_view input)
2121
{
22-
return std::get<Result>(std::get<lefticus::cons_expr<>::Atom>(evaluate(input).value));
22+
return std::get<Result>(std::get<cons_expr_type::Atom>(evaluate(input).value));
2323
}
2424

2525
int main()

include/cons_expr/cons_expr.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1539,7 +1539,7 @@ struct cons_expr
15391539
[[nodiscard]] constexpr auto make_callable(SExpr callable) noexcept
15401540
requires std::is_function_v<Signature>
15411541
{
1542-
auto impl = [this, callable]<typename Ret, typename... Params>(Ret (*)(Params...)) {
1542+
auto impl = [callable]<typename Ret, typename... Params>(Ret (*)(Params...)) {
15431543
return [callable](cons_expr &engine, Params... params) {
15441544
std::array<SExpr, sizeof...(Params)> args{ SExpr{ Atom{ params } }... };
15451545
if constexpr (std::is_same_v<void, Ret>) {

src/ccons_expr/main.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] const char *argv[])
5050
}
5151

5252
globals.clear();
53-
for (std::size_t index = 0; auto [key, value] : evaluator.global_scope[{ 0, evaluator.global_scope.size() }]) {
53+
for (auto [key, value] : evaluator.global_scope[{ 0, evaluator.global_scope.size() }]) {
5454
globals.push_back(std::format("{}: '{}'", to_string(evaluator, false, key), to_string(evaluator, true, value)));
55-
++index;
5655
}
5756
};
5857

0 commit comments

Comments
 (0)