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.

Sign up for GitHub

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

Jump to bottom

Update urdf/model.h -> urdf/model.hpp #3003

Merged
merged 5 commits into from
Oct 11, 2024
Merged

Update urdf/model.h -> urdf/model.hpp #3003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46c7139
Update urdf/model.h -> urdf/model.hpp
rhaschke Sep 16, 2024
7a98597
Merge branch 'main' into fix-urdf-include
sjahr Sep 30, 2024
8487db5
Merge branch 'main' into fix-urdf-include
sjahr Oct 10, 2024
d0c7179
Use conditional includes
sjahr Oct 10, 2024
584846f
Temporarily disable header deprecation warnings
rhaschke Oct 11, 2024
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 .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
# TODO(andyz): When this clang-tidy issue is fixed, remove -Wno-unknown-warning-option
# https://stackoverflow.com/a/41673702
CXXFLAGS: >-
-Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls -Wno-unknown-warning-option
-Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls -Wno-unknown-warning-option -Wno-cpp
CLANG_TIDY_ARGS: --fix --fix-errors --format-style=file
DOCKER_IMAGE: moveit/moveit2:${{ matrix.env.IMAGE }}
UPSTREAM_WORKSPACE: >
Expand Down
4 changes: 4 additions & 0 deletions moveit_core/constraint_samplers/test/pr2_arm_ik.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@
#pragma once

#include <urdf_model/model.h>
#if __has_include(<urdf/model.hpp>)
#include <urdf/model.hpp>
sea-bass marked this conversation as resolved.
Show resolved Hide resolved
#else
#include <urdf/model.h>
#endif
#include <Eigen/Geometry>
#include <Eigen/LU> // provides LU decomposition
#include <kdl/chainiksolver.hpp>
Expand Down
4 changes: 4 additions & 0 deletions moveit_core/constraint_samplers/test/pr2_arm_kinematics_plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,11 @@

#include <kdl/chainfksolverpos_recursive.hpp>

#if __has_include(<urdf/model.hpp>)
#include <urdf/model.hpp>
#else
#include <urdf/model.h>
#endif

#include <moveit/kinematics_base/kinematics_base.h>

Expand Down
4 changes: 4 additions & 0 deletions moveit_core/utils/include/moveit/utils/robot_model_test_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@
#pragma once

#include <srdfdom/srdf_writer.h>
#if __has_include(<urdf/model.hpp>)
#include <urdf/model.hpp>
#else
#include <urdf/model.h>
#endif
#include <moveit/robot_model/robot_model.h>
#include <geometry_msgs/msg/pose.hpp>

Expand Down
4 changes: 4 additions & 0 deletions moveit_ros/planning/rdf_loader/include/moveit/rdf_loader/rdf_loader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@

#include <moveit/macros/class_forward.h>
#include <moveit/rdf_loader/synchronized_string_parameter.h>
#if __has_include(<urdf/model.hpp>)
#include <urdf/model.hpp>
#else
#include <urdf/model.h>
#endif
#include <srdfdom/model.h>
#include <rclcpp/rclcpp.hpp>

Expand Down
6 changes: 5 additions & 1 deletion ...etup_assistant/moveit_setup_framework/include/moveit_setup_framework/data/urdf_config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@
#pragma once

#include <moveit_setup_framework/config.hpp>
#include <urdf/model.h> // for testing a valid urdf is loaded
#if __has_include(<urdf/model.hpp>) // for testing a valid urdf is loaded
#include <urdf/model.hpp>
#else
#include <urdf/model.h>
#endif

namespace moveit_setup
{
Expand Down
Loading