From 2b9173b372b4e33559104d0afdb99f32b98eb01e Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 20 Jan 2025 18:00:34 +0100 Subject: [PATCH 1/2] Explicit convert from std::filesystem::path to std::string for Windows compatibility (#3249) --- .../src/collisions_updater.cpp | 4 ++-- .../src/setup_assistant_widget.cpp | 2 +- .../configuration_files.hpp | 2 +- .../src/configuration_files_widget.cpp | 8 ++++---- .../moveit_setup_core_plugins/src/start_screen.cpp | 2 +- .../src/start_screen_widget.cpp | 6 +++--- .../moveit_setup_framework/data/srdf_config.hpp | 2 +- .../moveit_setup_framework/src/srdf_config.cpp | 2 +- .../moveit_setup_framework/src/urdf_config.cpp | 14 +++++++------- .../moveit_setup_framework/src/utilities.cpp | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/moveit_setup_assistant/moveit_setup_assistant/src/collisions_updater.cpp b/moveit_setup_assistant/moveit_setup_assistant/src/collisions_updater.cpp index d8963e1be1..f99e493ac8 100644 --- a/moveit_setup_assistant/moveit_setup_assistant/src/collisions_updater.cpp +++ b/moveit_setup_assistant/moveit_setup_assistant/src/collisions_updater.cpp @@ -100,7 +100,7 @@ int main(int argc, char* argv[]) auto package_settings = config_data->get("package_settings"); try { - package_settings->loadExisting(config_pkg_path); + package_settings->loadExisting(config_pkg_path.string()); } catch (const std::runtime_error& e) { @@ -113,7 +113,7 @@ int main(int argc, char* argv[]) RCLCPP_ERROR_STREAM(node->get_logger(), "Please provide config package or URDF and SRDF path"); return 1; } - else if (rdf_loader::RDFLoader::isXacroFile(srdf_path) && output_path.empty()) + else if (rdf_loader::RDFLoader::isXacroFile(srdf_path.string()) && output_path.empty()) { RCLCPP_ERROR_STREAM(node->get_logger(), "Please provide a different output file for SRDF xacro input file"); return 1; diff --git a/moveit_setup_assistant/moveit_setup_assistant/src/setup_assistant_widget.cpp b/moveit_setup_assistant/moveit_setup_assistant/src/setup_assistant_widget.cpp index 2d56b5e404..bab1ec0949 100644 --- a/moveit_setup_assistant/moveit_setup_assistant/src/setup_assistant_widget.cpp +++ b/moveit_setup_assistant/moveit_setup_assistant/src/setup_assistant_widget.cpp @@ -71,7 +71,7 @@ SetupAssistantWidget::SetupAssistantWidget(const rviz_common::ros_integration::R // Setting the window icon auto icon_path = getSharePath("moveit_ros_visualization") / "icons/classes/MotionPlanning.png"; - setWindowIcon(QIcon(icon_path.c_str())); + setWindowIcon(QIcon(icon_path.string().c_str())); // Basic widget container ----------------------------------------- QHBoxLayout* layout = new QHBoxLayout(); diff --git a/moveit_setup_assistant/moveit_setup_core_plugins/include/moveit_setup_core_plugins/configuration_files.hpp b/moveit_setup_assistant/moveit_setup_core_plugins/include/moveit_setup_core_plugins/configuration_files.hpp index bfca1e8d62..3d3f3ab386 100644 --- a/moveit_setup_assistant/moveit_setup_core_plugins/include/moveit_setup_core_plugins/configuration_files.hpp +++ b/moveit_setup_assistant/moveit_setup_core_plugins/include/moveit_setup_core_plugins/configuration_files.hpp @@ -80,7 +80,7 @@ class ConfigurationFiles : public SetupStep bool shouldGenerate(const GeneratedFilePtr& file) const { - std::string rel_path = file->getRelativePath(); + std::string rel_path = file->getRelativePath().string(); auto it = should_generate_.find(rel_path); if (it == should_generate_.end()) { diff --git a/moveit_setup_assistant/moveit_setup_core_plugins/src/configuration_files_widget.cpp b/moveit_setup_assistant/moveit_setup_core_plugins/src/configuration_files_widget.cpp index a9ef9bf85b..9e4c3484ab 100644 --- a/moveit_setup_assistant/moveit_setup_core_plugins/src/configuration_files_widget.cpp +++ b/moveit_setup_assistant/moveit_setup_core_plugins/src/configuration_files_widget.cpp @@ -294,7 +294,7 @@ void ConfigurationFilesWidget::changeCheckedState(QListWidgetItem* item) } // Enable/disable file - setup_step_.setShouldGenerate(gen_file->getRelativePath(), generate); + setup_step_.setShouldGenerate(gen_file->getRelativePath().string(), generate); } // ****************************************************************************************** @@ -303,7 +303,7 @@ void ConfigurationFilesWidget::changeCheckedState(QListWidgetItem* item) void ConfigurationFilesWidget::focusGiven() { // Pass the package path from start screen to configuration files screen - stack_path_->setPath(setup_step_.getPackagePath()); + stack_path_->setPath(setup_step_.getPackagePath().string()); setup_step_.loadFiles(); @@ -352,7 +352,7 @@ void ConfigurationFilesWidget::showGenFiles() auto gen_file = gen_files[i]; // Create a formatted row - QListWidgetItem* item = new QListWidgetItem(QString(gen_file->getRelativePath().c_str()), action_list_, 0); + QListWidgetItem* item = new QListWidgetItem(QString(gen_file->getRelativePath().string().c_str()), action_list_, 0); // Checkbox item->setCheckState(setup_step_.shouldGenerate(gen_file) ? Qt::Checked : Qt::Unchecked); @@ -480,7 +480,7 @@ bool ConfigurationFilesWidget::generatePackage() // Error occurred QMessageBox::critical(this, "Error Generating File", QString("Failed to generate folder or file: '") - .append(gen_file->getRelativePath().c_str()) + .append(gen_file->getRelativePath().string().c_str()) .append("' at location:\n") .append(absolute_path.c_str())); return false; diff --git a/moveit_setup_assistant/moveit_setup_core_plugins/src/start_screen.cpp b/moveit_setup_assistant/moveit_setup_core_plugins/src/start_screen.cpp index ff6827d6ff..b0550b1e90 100644 --- a/moveit_setup_assistant/moveit_setup_core_plugins/src/start_screen.cpp +++ b/moveit_setup_assistant/moveit_setup_core_plugins/src/start_screen.cpp @@ -70,7 +70,7 @@ std::filesystem::path StartScreen::getPackagePath() void StartScreen::loadExisting(const std::filesystem::path& package_path) { - package_settings_->loadExisting(package_path); + package_settings_->loadExisting(package_path.string()); } bool StartScreen::isXacroFile() diff --git a/moveit_setup_assistant/moveit_setup_core_plugins/src/start_screen_widget.cpp b/moveit_setup_assistant/moveit_setup_core_plugins/src/start_screen_widget.cpp index aef1b0f2f1..edd73eb3c9 100644 --- a/moveit_setup_assistant/moveit_setup_core_plugins/src/start_screen_widget.cpp +++ b/moveit_setup_assistant/moveit_setup_core_plugins/src/start_screen_widget.cpp @@ -205,7 +205,7 @@ void StartScreenWidget::focusGiven() std::filesystem::path pkg_path = setup_step_.getPackagePath(); if (!pkg_path.empty()) { - stack_path_->setPath(pkg_path); + stack_path_->setPath(pkg_path.string()); select_mode_->btn_exist_->click(); return; } @@ -213,7 +213,7 @@ void StartScreenWidget::focusGiven() std::filesystem::path urdf_path = setup_step_.getURDFPath(); if (!urdf_path.empty()) { - urdf_file_->setPath(urdf_path); + urdf_file_->setPath(urdf_path.string()); select_mode_->btn_new_->click(); } } @@ -324,7 +324,7 @@ bool StartScreenWidget::loadPackageSettings(bool show_warnings) try { - setup_step_.loadExisting(package_path_input); + setup_step_.loadExisting(package_path_input.string()); return true; } catch (const std::runtime_error& e) diff --git a/moveit_setup_assistant/moveit_setup_framework/include/moveit_setup_framework/data/srdf_config.hpp b/moveit_setup_assistant/moveit_setup_framework/include/moveit_setup_framework/data/srdf_config.hpp index 92508e0251..5b7fed77dd 100644 --- a/moveit_setup_assistant/moveit_setup_framework/include/moveit_setup_framework/data/srdf_config.hpp +++ b/moveit_setup_assistant/moveit_setup_framework/include/moveit_setup_framework/data/srdf_config.hpp @@ -263,7 +263,7 @@ class SRDFConfig : public SetupConfig bool write(const std::filesystem::path& path) { - return srdf_.writeSRDF(path); + return srdf_.writeSRDF(path.string()); } std::filesystem::path getPath() const diff --git a/moveit_setup_assistant/moveit_setup_framework/src/srdf_config.cpp b/moveit_setup_assistant/moveit_setup_framework/src/srdf_config.cpp index d19bdbfa50..69002a3ec7 100644 --- a/moveit_setup_assistant/moveit_setup_framework/src/srdf_config.cpp +++ b/moveit_setup_assistant/moveit_setup_framework/src/srdf_config.cpp @@ -88,7 +88,7 @@ void SRDFConfig::loadSRDFFile(const std::filesystem::path& srdf_file_path, const loadURDFModel(); std::string srdf_string; - if (!rdf_loader::RDFLoader::loadXmlFileToString(srdf_string, srdf_path_, xacro_args)) + if (!rdf_loader::RDFLoader::loadXmlFileToString(srdf_string, srdf_path_.string(), xacro_args)) { throw std::runtime_error("SRDF file not found: " + srdf_path_.string()); } diff --git a/moveit_setup_assistant/moveit_setup_framework/src/urdf_config.cpp b/moveit_setup_assistant/moveit_setup_framework/src/urdf_config.cpp index 72d9bf4af8..eab6823260 100644 --- a/moveit_setup_assistant/moveit_setup_framework/src/urdf_config.cpp +++ b/moveit_setup_assistant/moveit_setup_framework/src/urdf_config.cpp @@ -120,13 +120,13 @@ void URDFConfig::setPackageName() void URDFConfig::loadFromPackage(const std::filesystem::path& package_name, const std::filesystem::path& relative_path, const std::string& xacro_args) { - const std::filesystem::path package_path = getSharePath(package_name); + const std::filesystem::path package_path = getSharePath(package_name.string()); if (package_path.empty()) { throw std::runtime_error("URDF/COLLADA package not found: ''" + package_name.string()); } - urdf_pkg_name_ = package_name; + urdf_pkg_name_ = package_name.string(); urdf_pkg_relative_path_ = relative_path; xacro_args_ = xacro_args; @@ -139,12 +139,12 @@ void URDFConfig::load() RCLCPP_DEBUG_STREAM(*logger_, "URDF Package Name: " << urdf_pkg_name_); RCLCPP_DEBUG_STREAM(*logger_, "URDF Package Path: " << urdf_pkg_relative_path_); - if (!rdf_loader::RDFLoader::loadXmlFileToString(urdf_string_, urdf_path_, xacro_args_vec_)) + if (!rdf_loader::RDFLoader::loadXmlFileToString(urdf_string_, urdf_path_.string(), xacro_args_vec_)) { throw std::runtime_error("URDF/COLLADA file not found: " + urdf_path_.string()); } - if (urdf_string_.empty() && rdf_loader::RDFLoader::isXacroFile(urdf_path_)) + if (urdf_string_.empty() && rdf_loader::RDFLoader::isXacroFile(urdf_path_.string())) { throw std::runtime_error("Running xacro failed.\nPlease check console for errors."); } @@ -154,7 +154,7 @@ void URDFConfig::load() { throw std::runtime_error("URDF/COLLADA file is not a valid robot model."); } - urdf_from_xacro_ = rdf_loader::RDFLoader::isXacroFile(urdf_path_); + urdf_from_xacro_ = rdf_loader::RDFLoader::isXacroFile(urdf_path_.string()); // Set parameter parent_node_->set_parameter(rclcpp::Parameter("robot_description", urdf_string_)); @@ -164,7 +164,7 @@ void URDFConfig::load() bool URDFConfig::isXacroFile() const { - return rdf_loader::RDFLoader::isXacroFile(urdf_path_); + return rdf_loader::RDFLoader::isXacroFile(urdf_path_.string()); } bool URDFConfig::isConfigured() const @@ -182,7 +182,7 @@ void URDFConfig::collectVariables(std::vector& variables) std::string urdf_location; if (urdf_pkg_name_.empty()) { - urdf_location = urdf_path_; + urdf_location = urdf_path_.string(); } else { diff --git a/moveit_setup_assistant/moveit_setup_framework/src/utilities.cpp b/moveit_setup_assistant/moveit_setup_framework/src/utilities.cpp index 3625d94594..43ade4b276 100644 --- a/moveit_setup_assistant/moveit_setup_framework/src/utilities.cpp +++ b/moveit_setup_assistant/moveit_setup_framework/src/utilities.cpp @@ -63,7 +63,7 @@ bool extractPackageNameFromPath(const std::filesystem::path& path, std::string& // Default package name to folder name package_name = sub_path.filename().string(); tinyxml2::XMLDocument package_xml_file; - auto is_open = package_xml_file.LoadFile((sub_path / "package.xml").c_str()); + auto is_open = package_xml_file.LoadFile((sub_path / "package.xml").string().c_str()); if (is_open == tinyxml2::XML_SUCCESS) { auto name_potential = From e11cabbadf895c421c9c7018f974d786ec80cad8 Mon Sep 17 00:00:00 2001 From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com> Date: Tue, 21 Jan 2025 20:16:41 -0500 Subject: [PATCH 2/2] Update includes for generate_parameter_library 0.4.0 (#3255) * Update includes for generate_parameter_library 0.4.0 * Fix header prefix in IKFast template --- .../moveit/online_signal_smoothing/acceleration_filter.hpp | 2 +- .../moveit/online_signal_smoothing/butterworth_filter.hpp | 2 +- .../include/moveit/online_signal_smoothing/ruckig_filter.hpp | 2 +- .../cached_ik_kinematics_plugin.hpp | 2 +- .../templates/ikfast61_moveit_plugin_template.cpp | 2 +- .../moveit/kdl_kinematics_plugin/kdl_kinematics_plugin.hpp | 2 +- .../moveit/srv_kinematics_plugin/srv_kinematics_plugin.hpp | 2 +- .../pilz_industrial_motion_planner/command_list_manager.hpp | 2 +- .../pilz_industrial_motion_planner/limits_container.hpp | 2 +- .../pilz_industrial_motion_planner.hpp | 2 +- .../src/command_list_manager.cpp | 2 +- .../src/pilz_industrial_motion_planner.cpp | 2 +- .../unit_tests/src/unittest_trajectory_generator_common.cpp | 2 +- .../include/stomp_moveit/stomp_moveit_planning_context.hpp | 2 +- moveit_planners/stomp/src/stomp_moveit_planning_context.cpp | 2 +- .../src/prbt_manipulator_ikfast_moveit_plugin.cpp | 2 +- .../src/hybrid_planning_manager.cpp | 2 +- .../local_planner_component/src/local_planner_component.cpp | 2 +- .../moveit_servo/include/moveit_servo/collision_monitor.hpp | 2 +- moveit_ros/moveit_servo/include/moveit_servo/servo.hpp | 2 +- moveit_ros/moveit_servo/include/moveit_servo/utils/common.hpp | 2 +- .../kinematics_plugin_loader/kinematics_plugin_loader.hpp | 2 +- .../include/moveit/planning_pipeline/planning_pipeline.hpp | 2 +- .../src/check_for_stacked_constraints.cpp | 2 +- .../src/check_start_state_bounds.cpp | 2 +- .../src/check_start_state_collision.cpp | 2 +- .../src/validate_workspace_bounds.cpp | 2 +- .../src/add_time_optimal_parameterization.cpp | 2 +- .../src/display_motion_path.cpp | 2 +- .../planning_response_adapter_plugins/src/validate_path.cpp | 3 ++- 30 files changed, 31 insertions(+), 30 deletions(-) diff --git a/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp b/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp index def9fa48ec..8a542983ba 100644 --- a/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp +++ b/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/acceleration_filter.hpp @@ -78,7 +78,7 @@ c --------x--- v | #include #include #include -#include +#include #include #include diff --git a/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/butterworth_filter.hpp b/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/butterworth_filter.hpp index aa7d4af124..ae153fbba8 100644 --- a/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/butterworth_filter.hpp +++ b/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/butterworth_filter.hpp @@ -41,9 +41,9 @@ #include -#include #include #include +#include namespace online_signal_smoothing { diff --git a/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/ruckig_filter.hpp b/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/ruckig_filter.hpp index db523cfa2e..f5fddba4d0 100644 --- a/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/ruckig_filter.hpp +++ b/moveit_core/online_signal_smoothing/include/moveit/online_signal_smoothing/ruckig_filter.hpp @@ -42,7 +42,7 @@ Description: Applies jerk/acceleration/velocity limits to online motion commands #include #include -#include +#include #include diff --git a/moveit_kinematics/cached_ik_kinematics_plugin/include/moveit/cached_ik_kinematics_plugin/cached_ik_kinematics_plugin.hpp b/moveit_kinematics/cached_ik_kinematics_plugin/include/moveit/cached_ik_kinematics_plugin/cached_ik_kinematics_plugin.hpp index a0cce0ab4b..dca7185a75 100644 --- a/moveit_kinematics/cached_ik_kinematics_plugin/include/moveit/cached_ik_kinematics_plugin/cached_ik_kinematics_plugin.hpp +++ b/moveit_kinematics/cached_ik_kinematics_plugin/include/moveit/cached_ik_kinematics_plugin/cached_ik_kinematics_plugin.hpp @@ -55,8 +55,8 @@ #include #include #include -#include #include +#include namespace cached_ik_kinematics_plugin { diff --git a/moveit_kinematics/ikfast_kinematics_plugin/templates/ikfast61_moveit_plugin_template.cpp b/moveit_kinematics/ikfast_kinematics_plugin/templates/ikfast61_moveit_plugin_template.cpp index 49f506b420..c50f3a7804 100644 --- a/moveit_kinematics/ikfast_kinematics_plugin/templates/ikfast61_moveit_plugin_template.cpp +++ b/moveit_kinematics/ikfast_kinematics_plugin/templates/ikfast61_moveit_plugin_template.cpp @@ -47,8 +47,8 @@ #include #include #include -#include #include +#include <_PACKAGE_NAME_/ikfast_kinematics_parameters.hpp> using namespace moveit::core; diff --git a/moveit_kinematics/kdl_kinematics_plugin/include/moveit/kdl_kinematics_plugin/kdl_kinematics_plugin.hpp b/moveit_kinematics/kdl_kinematics_plugin/include/moveit/kdl_kinematics_plugin/kdl_kinematics_plugin.hpp index f6bb09f0e5..710e560d33 100644 --- a/moveit_kinematics/kdl_kinematics_plugin/include/moveit/kdl_kinematics_plugin/kdl_kinematics_plugin.hpp +++ b/moveit_kinematics/kdl_kinematics_plugin/include/moveit/kdl_kinematics_plugin/kdl_kinematics_plugin.hpp @@ -39,7 +39,6 @@ // ROS #include #include -#include // ROS msgs #include @@ -58,6 +57,7 @@ #include #include #include +#include #include diff --git a/moveit_kinematics/srv_kinematics_plugin/include/moveit/srv_kinematics_plugin/srv_kinematics_plugin.hpp b/moveit_kinematics/srv_kinematics_plugin/include/moveit/srv_kinematics_plugin/srv_kinematics_plugin.hpp index 84b2289ad3..6a2f11da4a 100644 --- a/moveit_kinematics/srv_kinematics_plugin/include/moveit/srv_kinematics_plugin/srv_kinematics_plugin.hpp +++ b/moveit_kinematics/srv_kinematics_plugin/include/moveit/srv_kinematics_plugin/srv_kinematics_plugin.hpp @@ -43,7 +43,6 @@ // ROS2 #include -#include // System #include @@ -56,6 +55,7 @@ // MoveIt #include #include +#include namespace srv_kinematics_plugin { diff --git a/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/command_list_manager.hpp b/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/command_list_manager.hpp index a3a64b6dfe..213cb3b5ad 100644 --- a/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/command_list_manager.hpp +++ b/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/command_list_manager.hpp @@ -48,7 +48,7 @@ #include #include -#include +#include namespace pilz_industrial_motion_planner { diff --git a/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/limits_container.hpp b/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/limits_container.hpp index e26a52e276..42e2df3f88 100644 --- a/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/limits_container.hpp +++ b/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/limits_container.hpp @@ -37,7 +37,7 @@ #include #include -#include "cartesian_limits_parameters.hpp" +#include namespace pilz_industrial_motion_planner { diff --git a/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/pilz_industrial_motion_planner.hpp b/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/pilz_industrial_motion_planner.hpp index 535fbd9644..bacb5f559e 100644 --- a/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/pilz_industrial_motion_planner.hpp +++ b/moveit_planners/pilz_industrial_motion_planner/include/pilz_industrial_motion_planner/pilz_industrial_motion_planner.hpp @@ -45,7 +45,7 @@ #include #include -#include +#include namespace pilz_industrial_motion_planner { diff --git a/moveit_planners/pilz_industrial_motion_planner/src/command_list_manager.cpp b/moveit_planners/pilz_industrial_motion_planner/src/command_list_manager.cpp index d222dd1e7c..03083f3ae5 100644 --- a/moveit_planners/pilz_industrial_motion_planner/src/command_list_manager.cpp +++ b/moveit_planners/pilz_industrial_motion_planner/src/command_list_manager.cpp @@ -44,7 +44,7 @@ #include #include -#include "cartesian_limits_parameters.hpp" +#include #include #include #include diff --git a/moveit_planners/pilz_industrial_motion_planner/src/pilz_industrial_motion_planner.cpp b/moveit_planners/pilz_industrial_motion_planner/src/pilz_industrial_motion_planner.cpp index fbf19bf372..c3c3e83034 100644 --- a/moveit_planners/pilz_industrial_motion_planner/src/pilz_industrial_motion_planner.cpp +++ b/moveit_planners/pilz_industrial_motion_planner/src/pilz_industrial_motion_planner.cpp @@ -40,7 +40,7 @@ #include #include -#include "cartesian_limits_parameters.hpp" +#include #include #include diff --git a/moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_generator_common.cpp b/moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_generator_common.cpp index fbc31afa11..9c491789c3 100644 --- a/moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_generator_common.cpp +++ b/moveit_planners/pilz_industrial_motion_planner/test/unit_tests/src/unittest_trajectory_generator_common.cpp @@ -53,7 +53,7 @@ #include -#include "cartesian_limits_parameters.hpp" +#include const std::string PARAM_MODEL_NO_GRIPPER_NAME{ "robot_description" }; const std::string PARAM_MODEL_WITH_GRIPPER_NAME{ "robot_description_pg70" }; diff --git a/moveit_planners/stomp/include/stomp_moveit/stomp_moveit_planning_context.hpp b/moveit_planners/stomp/include/stomp_moveit/stomp_moveit_planning_context.hpp index a5add5e515..dcce1be46c 100644 --- a/moveit_planners/stomp/include/stomp_moveit/stomp_moveit_planning_context.hpp +++ b/moveit_planners/stomp/include/stomp_moveit/stomp_moveit_planning_context.hpp @@ -41,7 +41,7 @@ #include -#include +#include // Forward declaration namespace stomp diff --git a/moveit_planners/stomp/src/stomp_moveit_planning_context.cpp b/moveit_planners/stomp/src/stomp_moveit_planning_context.cpp index 4d37e61de6..52a5413588 100644 --- a/moveit_planners/stomp/src/stomp_moveit_planning_context.cpp +++ b/moveit_planners/stomp/src/stomp_moveit_planning_context.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include diff --git a/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/src/prbt_manipulator_ikfast_moveit_plugin.cpp b/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/src/prbt_manipulator_ikfast_moveit_plugin.cpp index 4ea25702de..b1929ff008 100644 --- a/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/src/prbt_manipulator_ikfast_moveit_plugin.cpp +++ b/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/src/prbt_manipulator_ikfast_moveit_plugin.cpp @@ -52,7 +52,7 @@ #include #include #include -#include +#include using namespace moveit::core; diff --git a/moveit_ros/hybrid_planning/hybrid_planning_manager/hybrid_planning_manager_component/src/hybrid_planning_manager.cpp b/moveit_ros/hybrid_planning/hybrid_planning_manager/hybrid_planning_manager_component/src/hybrid_planning_manager.cpp index ec1e3a2f95..44c0f0f26c 100644 --- a/moveit_ros/hybrid_planning/hybrid_planning_manager/hybrid_planning_manager_component/src/hybrid_planning_manager.cpp +++ b/moveit_ros/hybrid_planning/hybrid_planning_manager/hybrid_planning_manager_component/src/hybrid_planning_manager.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include namespace moveit::hybrid_planning diff --git a/moveit_ros/hybrid_planning/local_planner/local_planner_component/src/local_planner_component.cpp b/moveit_ros/hybrid_planning/local_planner/local_planner_component/src/local_planner_component.cpp index f9914f2ee9..cff465afe7 100644 --- a/moveit_ros/hybrid_planning/local_planner/local_planner_component/src/local_planner_component.cpp +++ b/moveit_ros/hybrid_planning/local_planner/local_planner_component/src/local_planner_component.cpp @@ -33,7 +33,7 @@ *********************************************************************/ #include -#include +#include #include #include diff --git a/moveit_ros/moveit_servo/include/moveit_servo/collision_monitor.hpp b/moveit_ros/moveit_servo/include/moveit_servo/collision_monitor.hpp index 9752e5feb6..91c1dfdb9a 100644 --- a/moveit_ros/moveit_servo/include/moveit_servo/collision_monitor.hpp +++ b/moveit_ros/moveit_servo/include/moveit_servo/collision_monitor.hpp @@ -41,9 +41,9 @@ #pragma once -#include #include #include +#include namespace moveit_servo { diff --git a/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp b/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp index d0331c650d..c9a99151d4 100644 --- a/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp +++ b/moveit_ros/moveit_servo/include/moveit_servo/servo.hpp @@ -41,8 +41,8 @@ #pragma once -#include #include +#include #include #include #include diff --git a/moveit_ros/moveit_servo/include/moveit_servo/utils/common.hpp b/moveit_ros/moveit_servo/include/moveit_servo/utils/common.hpp index 6d44c18298..1da9fd7e5e 100644 --- a/moveit_ros/moveit_servo/include/moveit_servo/utils/common.hpp +++ b/moveit_ros/moveit_servo/include/moveit_servo/utils/common.hpp @@ -41,7 +41,7 @@ #pragma once -#include +#include #include #include #include diff --git a/moveit_ros/planning/kinematics_plugin_loader/include/moveit/kinematics_plugin_loader/kinematics_plugin_loader.hpp b/moveit_ros/planning/kinematics_plugin_loader/include/moveit/kinematics_plugin_loader/kinematics_plugin_loader.hpp index e7494cf73c..968beae2f6 100644 --- a/moveit_ros/planning/kinematics_plugin_loader/include/moveit/kinematics_plugin_loader/kinematics_plugin_loader.hpp +++ b/moveit_ros/planning/kinematics_plugin_loader/include/moveit/kinematics_plugin_loader/kinematics_plugin_loader.hpp @@ -39,8 +39,8 @@ #include #include #include -#include #include +#include namespace kinematics_plugin_loader { diff --git a/moveit_ros/planning/planning_pipeline/include/moveit/planning_pipeline/planning_pipeline.hpp b/moveit_ros/planning/planning_pipeline/include/moveit/planning_pipeline/planning_pipeline.hpp index 18abda399b..f5681eeb19 100644 --- a/moveit_ros/planning/planning_pipeline/include/moveit/planning_pipeline/planning_pipeline.hpp +++ b/moveit_ros/planning/planning_pipeline/include/moveit/planning_pipeline/planning_pipeline.hpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include namespace planning_pipeline { diff --git a/moveit_ros/planning/planning_request_adapter_plugins/src/check_for_stacked_constraints.cpp b/moveit_ros/planning/planning_request_adapter_plugins/src/check_for_stacked_constraints.cpp index e0b60847c1..08727ab521 100644 --- a/moveit_ros/planning/planning_request_adapter_plugins/src/check_for_stacked_constraints.cpp +++ b/moveit_ros/planning/planning_request_adapter_plugins/src/check_for_stacked_constraints.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include namespace default_planning_request_adapters { diff --git a/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_bounds.cpp b/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_bounds.cpp index 4b22eee85a..b0e29a46aa 100644 --- a/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_bounds.cpp +++ b/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_bounds.cpp @@ -53,7 +53,7 @@ #include #include -#include +#include namespace default_planning_request_adapters { diff --git a/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_collision.cpp b/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_collision.cpp index 99ccf820d7..5843dde8dc 100644 --- a/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_collision.cpp +++ b/moveit_ros/planning/planning_request_adapter_plugins/src/check_start_state_collision.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include namespace default_planning_request_adapters { diff --git a/moveit_ros/planning/planning_request_adapter_plugins/src/validate_workspace_bounds.cpp b/moveit_ros/planning/planning_request_adapter_plugins/src/validate_workspace_bounds.cpp index a21dffe61e..df87b43326 100644 --- a/moveit_ros/planning/planning_request_adapter_plugins/src/validate_workspace_bounds.cpp +++ b/moveit_ros/planning/planning_request_adapter_plugins/src/validate_workspace_bounds.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include namespace default_planning_request_adapters { diff --git a/moveit_ros/planning/planning_response_adapter_plugins/src/add_time_optimal_parameterization.cpp b/moveit_ros/planning/planning_response_adapter_plugins/src/add_time_optimal_parameterization.cpp index b5097dce5f..fd2a764c0b 100644 --- a/moveit_ros/planning/planning_response_adapter_plugins/src/add_time_optimal_parameterization.cpp +++ b/moveit_ros/planning/planning_response_adapter_plugins/src/add_time_optimal_parameterization.cpp @@ -39,7 +39,7 @@ #include #include -#include +#include namespace default_planning_response_adapters { diff --git a/moveit_ros/planning/planning_response_adapter_plugins/src/display_motion_path.cpp b/moveit_ros/planning/planning_response_adapter_plugins/src/display_motion_path.cpp index bc6fa5f605..0c25d552ae 100644 --- a/moveit_ros/planning/planning_response_adapter_plugins/src/display_motion_path.cpp +++ b/moveit_ros/planning/planning_response_adapter_plugins/src/display_motion_path.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include namespace default_planning_response_adapters { diff --git a/moveit_ros/planning/planning_response_adapter_plugins/src/validate_path.cpp b/moveit_ros/planning/planning_response_adapter_plugins/src/validate_path.cpp index 1284ba821b..25384fc704 100644 --- a/moveit_ros/planning/planning_response_adapter_plugins/src/validate_path.cpp +++ b/moveit_ros/planning/planning_response_adapter_plugins/src/validate_path.cpp @@ -42,7 +42,8 @@ #include #include -#include +#include + namespace default_planning_response_adapters { /**