From 8377c48f91744f1a6abe7be96d613915d791c37d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Wed, 22 Jul 2026 09:42:12 +0200 Subject: [PATCH 1/3] Removed dead code (#299) Signed-off-by: Alejandro Hernandez Cordero (cherry picked from commit 0bf4e864eeb9dc91a130cecb8d87b77592d6ea87) # Conflicts: # pluginlib/include/pluginlib/class_loader_imp.hpp --- pluginlib/include/pluginlib/class_loader_imp.hpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pluginlib/include/pluginlib/class_loader_imp.hpp b/pluginlib/include/pluginlib/class_loader_imp.hpp index 89578e6..7bf6963 100644 --- a/pluginlib/include/pluginlib/class_loader_imp.hpp +++ b/pluginlib/include/pluginlib/class_loader_imp.hpp @@ -569,9 +569,14 @@ ClassLoader::getPackageFromPluginXMLFilePath(const std::string & plugin_xml_f // 1. Find nearest encasing package.xml // 2. Extract name of package from package.xml +<<<<<<< HEAD std::string package_name; rcpputils::fs::path p(plugin_xml_file_path); rcpputils::fs::path parent = p.parent_path(); +======= + std::filesystem::path p(plugin_xml_file_path); + std::filesystem::path parent = p.parent_path(); +>>>>>>> 0bf4e86 (Removed dead code (#299)) // Figure out exactly which package the passed XML file is exported by. while (true) { @@ -590,8 +595,6 @@ ClassLoader::getPackageFromPluginXMLFilePath(const std::string & plugin_xml_f return ""; } } - - return package_name; } template @@ -677,14 +680,16 @@ void ClassLoader::processSingleXMLPluginFile( throw pluginlib::InvalidXMLException( "XML Document '" + xml_file + "' has no Root Element. This likely means the XML is malformed or missing."); - return; } const char* config_value = config->Value(); if (NULL == config_value) { throw pluginlib::InvalidXMLException( "XML Document '" + xml_file + "' has an invalid Root Element. This likely means the XML is malformed or missing."); +<<<<<<< HEAD return; +======= +>>>>>>> 0bf4e86 (Removed dead code (#299)) } if (!(strcmp(config_value, "library") == 0 || strcmp(config_value, "class_libraries") == 0)) @@ -692,7 +697,6 @@ void ClassLoader::processSingleXMLPluginFile( throw pluginlib::InvalidXMLException( "The XML document '" + xml_file + "' given to add must have either \"library\" or " "\"class_libraries\" as the root tag"); - return; } // Step into the filter list if necessary if (strcmp(config_value, "class_libraries") == 0) { @@ -816,7 +820,6 @@ template std::string ClassLoader::stripAllButFileFromPath(const std::string & path) /***************************************************************************/ { - std::string only_file; size_t c = path.find_last_of(getPathSeparator()); if (std::string::npos == c) { return path; From 93a0a150b3b740acbd4e21ae13290df7c3513eee Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Cordero Date: Wed, 22 Jul 2026 09:51:41 +0200 Subject: [PATCH 2/3] fixed merge Signed-off-by: Alejandro Hernandez Cordero --- pluginlib/include/pluginlib/class_loader_imp.hpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pluginlib/include/pluginlib/class_loader_imp.hpp b/pluginlib/include/pluginlib/class_loader_imp.hpp index 7bf6963..d79cbf8 100644 --- a/pluginlib/include/pluginlib/class_loader_imp.hpp +++ b/pluginlib/include/pluginlib/class_loader_imp.hpp @@ -569,14 +569,8 @@ ClassLoader::getPackageFromPluginXMLFilePath(const std::string & plugin_xml_f // 1. Find nearest encasing package.xml // 2. Extract name of package from package.xml -<<<<<<< HEAD - std::string package_name; - rcpputils::fs::path p(plugin_xml_file_path); - rcpputils::fs::path parent = p.parent_path(); -======= std::filesystem::path p(plugin_xml_file_path); std::filesystem::path parent = p.parent_path(); ->>>>>>> 0bf4e86 (Removed dead code (#299)) // Figure out exactly which package the passed XML file is exported by. while (true) { @@ -686,10 +680,6 @@ void ClassLoader::processSingleXMLPluginFile( throw pluginlib::InvalidXMLException( "XML Document '" + xml_file + "' has an invalid Root Element. This likely means the XML is malformed or missing."); -<<<<<<< HEAD - return; -======= ->>>>>>> 0bf4e86 (Removed dead code (#299)) } if (!(strcmp(config_value, "library") == 0 || strcmp(config_value, "class_libraries") == 0)) From 9d68c6254136838ac4c42694cc6a7edfaa612362 Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Cordero Date: Wed, 22 Jul 2026 09:52:36 +0200 Subject: [PATCH 3/3] fixed merge Signed-off-by: Alejandro Hernandez Cordero --- pluginlib/include/pluginlib/class_loader_imp.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pluginlib/include/pluginlib/class_loader_imp.hpp b/pluginlib/include/pluginlib/class_loader_imp.hpp index d79cbf8..1780413 100644 --- a/pluginlib/include/pluginlib/class_loader_imp.hpp +++ b/pluginlib/include/pluginlib/class_loader_imp.hpp @@ -569,8 +569,8 @@ ClassLoader::getPackageFromPluginXMLFilePath(const std::string & plugin_xml_f // 1. Find nearest encasing package.xml // 2. Extract name of package from package.xml - std::filesystem::path p(plugin_xml_file_path); - std::filesystem::path parent = p.parent_path(); + rcpputils::fs::path p(plugin_xml_file_path); + rcpputils::fs::path parent = p.parent_path(); // Figure out exactly which package the passed XML file is exported by. while (true) {