Skip to content

refactor: Toml11 4.4 - #2568

Merged
rprospero merged 6 commits into
develop2from
toml11_4.4
Aug 6, 2026
Merged

refactor: Toml11 4.4#2568
rprospero merged 6 commits into
develop2from
toml11_4.4

Conversation

@rprospero

Copy link
Copy Markdown
Contributor

Merge after #2560

This PR upgrades our toml11 dependency from 3.7.0 to 4.4.0. This allows us to switch to cmake version 4. I also upgrade to the latest nixpkgs release (we were over a year out of date). Additionally, I have fixed us on GCC 14 on Linux, since GCC 15 has a known bug with compiling Qt at this time.

@rprospero
rprospero changed the base branch from develop2 to serialisible_concept July 31, 2026 14:13
@rprospero rprospero changed the title Toml11 4.4 refactor: Toml11 4.4 Jul 31, 2026
@rprospero
rprospero marked this pull request as ready for review July 31, 2026 16:33
Base automatically changed from serialisible_concept to develop2 August 5, 2026 11:11
This includes updating toml11 to 4.4 and using the nixpkgs supplied onedpl
Comment thread src/base/geometry.cpp
Comment on lines +35 to +38
bool Geometry::operator==(const Geometry &rhs) const
{
return value_ == rhs.value_ && std::equal(std::begin(indices_), std::end(indices_), std::begin(rhs.indices_));
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent. Been meaning to fix this particular warning for a while!

Comment thread src/base/serialiser.h Outdated

struct wo_comment_config
{
using comment_type = toml::discard_comments; // XXX

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing comment?

@rprospero
rprospero merged commit 5f1b186 into develop2 Aug 6, 2026
5 of 9 checks passed
@rprospero
rprospero deleted the toml11_4.4 branch August 6, 2026 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants