From eda2e64f137b8006bd98df2c1780d07e6001bd16 Mon Sep 17 00:00:00 2001
From: Carl Delsey <carl.r.delsey@intel.com>
Date: Wed, 5 Dec 2018 16:01:39 -0800
Subject: [PATCH] Fixing dwb package linter failures (#407)
---
.travis.yml | 2 +-
.../include/dwb_controller/dwb_controller.hpp | 8 ++++----
nav2_dwb_controller/dwb_controller/src/dwb_controller.cpp | 2 +-
.../dwb_core/include/dwb_core/trajectory_critic.hpp | 5 ++++-
nav2_dwb_controller/dwb_core/package.xml | 3 +--
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 1ec5a28f..76aa3e99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ before_install:
script:
- docker run --name nav2_bash --rm -d -i -t nav2:latest bash -l
- docker exec nav2_bash bash -c '. /ros2_ws/navigation2_ws/install/setup.bash &&
- colcon test --packages-skip dwb_controller dwb_core nav2_amcl nav2_costmap_2d
+ colcon test --packages-skip dwb_controller nav2_costmap_2d
nav2_dynamic_params nav2_map_server nav2_navfn_planner nav2_robot nav2_system_tests
nav2_tasks'
- docker exec nav2_bash bash -c "colcon test-result --verbose"
diff --git a/nav2_dwb_controller/dwb_controller/include/dwb_controller/dwb_controller.hpp b/nav2_dwb_controller/dwb_controller/include/dwb_controller/dwb_controller.hpp
index a79b1e61..083f7ffe 100644
--- a/nav2_dwb_controller/dwb_controller/include/dwb_controller/dwb_controller.hpp
+++ b/nav2_dwb_controller/dwb_controller/include/dwb_controller/dwb_controller.hpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef nav2_dwb_controller__DWB_CONTROLLER_HPP_
-#define nav2_dwb_controller__DWB_CONTROLLER_HPP_
+#ifndef DWB_CONTROLLER__DWB_CONTROLLER_HPP_
+#define DWB_CONTROLLER__DWB_CONTROLLER_HPP_
#include <memory>
#include <string>
@@ -29,7 +29,7 @@ namespace nav2_dwb_controller
class DwbController : public rclcpp::Node
{
public:
- DwbController(rclcpp::executor::Executor & executor);
+ explicit DwbController(rclcpp::executor::Executor & executor);
~DwbController();
nav2_tasks::TaskStatus followPath(const nav2_tasks::FollowPathCommand::SharedPtr path);
@@ -51,4 +51,4 @@ protected:
} // namespace nav2_dwb_controller
-#endif // nav2_dwb_controller__DWB_CONTROLLER_HPP_
+#endif // DWB_CONTROLLER__DWB_CONTROLLER_HPP_
diff --git a/nav2_dwb_controller/dwb_controller/src/dwb_controller.cpp b/nav2_dwb_controller/dwb_controller/src/dwb_controller.cpp
index 42c79c01..b16b67d9 100644
--- a/nav2_dwb_controller/dwb_controller/src/dwb_controller.cpp
+++ b/nav2_dwb_controller/dwb_controller/src/dwb_controller.cpp
@@ -25,7 +25,7 @@ using nav2_tasks::TaskStatus;
using dwb_core::DWBLocalPlanner;
using dwb_core::CostmapROSPtr;
-#define NO_OP_DELETER [](auto){}
+#define NO_OP_DELETER [] (auto) {}
namespace nav2_dwb_controller
{
diff --git a/nav2_dwb_controller/dwb_core/include/dwb_core/trajectory_critic.hpp b/nav2_dwb_controller/dwb_core/include/dwb_core/trajectory_critic.hpp
index 7e42b3d7..997148fb 100644
--- a/nav2_dwb_controller/dwb_core/include/dwb_core/trajectory_critic.hpp
+++ b/nav2_dwb_controller/dwb_core/include/dwb_core/trajectory_critic.hpp
@@ -89,7 +89,10 @@ public:
* @param parent_namespace The namespace of the planner
* @param costmap_ros Pointer to the costmap
*/
- void initialize(const std::shared_ptr<rclcpp::Node> & nh, std::string & name, CostmapROSPtr costmap_ros)
+ void initialize(
+ const std::shared_ptr<rclcpp::Node> & nh,
+ std::string & name,
+ CostmapROSPtr costmap_ros)
{
name_ = name;
costmap_ros_ = costmap_ros;
diff --git a/nav2_dwb_controller/dwb_core/package.xml b/nav2_dwb_controller/dwb_core/package.xml
index 47d8e069..b4ea8503 100644
--- a/nav2_dwb_controller/dwb_core/package.xml
+++ b/nav2_dwb_controller/dwb_core/package.xml
@@ -4,9 +4,8 @@
<name>dwb_core</name>
<version>0.1.1</version>
<description>TODO</description>
- <license>Apache License 2.0</license>
- <license>BSD</license>
<maintainer email="carl.r.delsey@intel.com">Carl Delsey</maintainer>
+ <license>BSD</license>
<buildtool_depend>ament_cmake</buildtool_depend>
--
GitLab