Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compilation issue for Boost 1.85 #2255

Merged
merged 6 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ repos:
doc/doxygen-awesome.*
)$
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.5
rev: v0.4.6
hooks:
- id: ruff-format
exclude: doc/
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]

### Fixed

- fix compilation issue for Boost 1.85 [#2255](https://github.com/stack-of-tasks/pinocchio/pull/2255)
jorisv marked this conversation as resolved.
Show resolved Hide resolved

## [3.0.0] - 2024-05-27

### Added
Expand Down
5 changes: 3 additions & 2 deletions src/parsers/mjcf/mjcf-graph.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ namespace pinocchio
std::string path = el + ".<xmlattr>";
if (parent.get_child_optional(path))
{
ptree attr_parent = parent.get_child(path, ptree());
ptree attr_current = current.get_child(path, ptree());
const ptree default_value = ptree();
ptree attr_parent = parent.get_child(path, default_value);
const ptree & attr_current = current.get_child(path, default_value);
// To only copy non existing attribute in current, we copy all current
// attribute (replacing) into a parent copy then we replace current with the new
// ptree
Expand Down
Loading