From c4e8a705c626c4f547e64d98bc2d6bed4fbd2b68 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Wed, 29 May 2024 11:31:06 +0200 Subject: [PATCH 1/6] mjcf: fix compilation issue for Boost 1.85 --- src/parsers/mjcf/mjcf-graph.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/parsers/mjcf/mjcf-graph.cpp b/src/parsers/mjcf/mjcf-graph.cpp index 1c62aac829..44d9d11f81 100644 --- a/src/parsers/mjcf/mjcf-graph.cpp +++ b/src/parsers/mjcf/mjcf-graph.cpp @@ -37,8 +37,9 @@ namespace pinocchio std::string path = el + "."; 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(); + const 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 From ab1f2f13a9d43e130a59ea3b9df23ac53854d45e Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Wed, 29 May 2024 11:36:34 +0200 Subject: [PATCH 2/6] changelog: sync --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 224a536b33..95ec01e724 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) + ## [3.0.0] - 2024-05-27 ### Added From 44bcbabab858035ee04e0a300a87ba5454530b68 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Wed, 29 May 2024 12:02:29 +0200 Subject: [PATCH 3/6] mjcf: fix --- src/parsers/mjcf/mjcf-graph.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parsers/mjcf/mjcf-graph.cpp b/src/parsers/mjcf/mjcf-graph.cpp index 44d9d11f81..56bf5abf15 100644 --- a/src/parsers/mjcf/mjcf-graph.cpp +++ b/src/parsers/mjcf/mjcf-graph.cpp @@ -38,7 +38,7 @@ namespace pinocchio if (parent.get_child_optional(path)) { const ptree default_value = ptree(); - const ptree & attr_parent = parent.get_child(path, default_value); + 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 From b2036bee2ab10e464eb9a4999d85be34b7e9c3a2 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Wed, 29 May 2024 14:26:59 +0200 Subject: [PATCH 4/6] pre-commit: update --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 410e4a459c..4cbb35e302 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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/ From 55b551174fec4df78b1ce58bf9e9d2d60c385e65 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Wed, 29 May 2024 14:28:42 +0200 Subject: [PATCH 5/6] mjcf: apply pre-commit --- src/parsers/mjcf/mjcf-graph.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parsers/mjcf/mjcf-graph.cpp b/src/parsers/mjcf/mjcf-graph.cpp index 56bf5abf15..46dd787056 100644 --- a/src/parsers/mjcf/mjcf-graph.cpp +++ b/src/parsers/mjcf/mjcf-graph.cpp @@ -37,7 +37,7 @@ namespace pinocchio std::string path = el + "."; if (parent.get_child_optional(path)) { - const ptree default_value = 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 From eb9ff0c3991a45e747c53f25506e3251972980eb Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Wed, 29 May 2024 17:35:41 +0200 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95ec01e724..3ea03d7832 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed -- fix compilation issue for Boost 1.85 [#2255](https://github.com/stack-of-tasks/pinocchio/pull/2255) +- Fix compilation issue for Boost 1.85 ([#2255](https://github.com/stack-of-tasks/pinocchio/pull/2255)) ## [3.0.0] - 2024-05-27