From a7a8106cf374ed62883bb3011e7eb60e7b4adcfe Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Fri, 7 Jan 2022 14:41:29 -0800 Subject: [PATCH 1/2] Fix include order and relative paths for cpplint Relates to https://github.com/ament/ament_lint/pull/324 Signed-off-by: Jacob Perron --- image_tools/src/burger.cpp | 2 +- intra_process_demo/src/image_pipeline/camera_node.cpp | 4 ++-- .../src/image_pipeline/image_pipeline_all_in_one.cpp | 4 ++-- .../image_pipeline_with_two_image_view.cpp | 4 ++-- .../src/image_pipeline/image_view_node.cpp | 4 ++-- .../src/image_pipeline/watermark_node.cpp | 4 ++-- pendulum_control/src/pendulum_demo.cpp | 10 +++++----- quality_of_service_demo/rclcpp/src/utils.cpp | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/image_tools/src/burger.cpp b/image_tools/src/burger.cpp index 02b718352..c7951e868 100644 --- a/image_tools/src/burger.cpp +++ b/image_tools/src/burger.cpp @@ -21,7 +21,7 @@ #include #include -#include "./burger.hpp" +#include "burger.hpp" #include "opencv2/core.hpp" #include "opencv2/core/mat.hpp" diff --git a/intra_process_demo/src/image_pipeline/camera_node.cpp b/intra_process_demo/src/image_pipeline/camera_node.cpp index ceefbf071..1d278fff5 100644 --- a/intra_process_demo/src/image_pipeline/camera_node.cpp +++ b/intra_process_demo/src/image_pipeline/camera_node.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "image_pipeline/camera_node.hpp" #include -#include - int main(int argc, char ** argv) { rclcpp::init(argc, argv); diff --git a/intra_process_demo/src/image_pipeline/image_pipeline_all_in_one.cpp b/intra_process_demo/src/image_pipeline/image_pipeline_all_in_one.cpp index 32f91590e..caaca1661 100644 --- a/intra_process_demo/src/image_pipeline/image_pipeline_all_in_one.cpp +++ b/intra_process_demo/src/image_pipeline/image_pipeline_all_in_one.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include +#include + #include "image_pipeline/camera_node.hpp" #include "image_pipeline/image_view_node.hpp" #include "image_pipeline/watermark_node.hpp" diff --git a/intra_process_demo/src/image_pipeline/image_pipeline_with_two_image_view.cpp b/intra_process_demo/src/image_pipeline/image_pipeline_with_two_image_view.cpp index 255e97e2d..522656e25 100644 --- a/intra_process_demo/src/image_pipeline/image_pipeline_with_two_image_view.cpp +++ b/intra_process_demo/src/image_pipeline/image_pipeline_with_two_image_view.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include - #include +#include + #include "image_pipeline/camera_node.hpp" #include "image_pipeline/image_view_node.hpp" #include "image_pipeline/watermark_node.hpp" diff --git a/intra_process_demo/src/image_pipeline/image_view_node.cpp b/intra_process_demo/src/image_pipeline/image_view_node.cpp index 94e190269..d172ef017 100644 --- a/intra_process_demo/src/image_pipeline/image_view_node.cpp +++ b/intra_process_demo/src/image_pipeline/image_view_node.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "image_pipeline/image_view_node.hpp" #include -#include - int main(int argc, char ** argv) { rclcpp::init(argc, argv); diff --git a/intra_process_demo/src/image_pipeline/watermark_node.cpp b/intra_process_demo/src/image_pipeline/watermark_node.cpp index a162bca42..1824f7612 100644 --- a/intra_process_demo/src/image_pipeline/watermark_node.cpp +++ b/intra_process_demo/src/image_pipeline/watermark_node.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "image_pipeline/watermark_node.hpp" #include -#include - int main(int argc, char ** argv) { rclcpp::init(argc, argv); diff --git a/pendulum_control/src/pendulum_demo.cpp b/pendulum_control/src/pendulum_demo.cpp index 0653215e7..63b0b19a2 100644 --- a/pendulum_control/src/pendulum_demo.cpp +++ b/pendulum_control/src/pendulum_demo.cpp @@ -14,7 +14,11 @@ #include -#include +#include +#include +#include + +#include "rttest/rttest.h" #include #include @@ -26,10 +30,6 @@ #include #include -#include -#include -#include - #include "pendulum_control/pendulum_controller.hpp" #include "pendulum_control/pendulum_motor.hpp" #include "pendulum_control/rtt_executor.hpp" diff --git a/quality_of_service_demo/rclcpp/src/utils.cpp b/quality_of_service_demo/rclcpp/src/utils.cpp index 7cf2f33c9..077897956 100644 --- a/quality_of_service_demo/rclcpp/src/utils.cpp +++ b/quality_of_service_demo/rclcpp/src/utils.cpp @@ -21,7 +21,7 @@ #include #include -#include "./utils.hpp" +#include "utils.hpp" double rmw_time_to_seconds(const rmw_time_t & time) From 1349899813d7a911e756a1f0d05b49e2ae3ae78f Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Tue, 11 Jan 2022 13:41:06 -0800 Subject: [PATCH 2/2] Use double-quotes for backwards compatibility Signed-off-by: Jacob Perron --- .../src/image_pipeline/camera_node.cpp | 2 +- .../image_pipeline/image_pipeline_all_in_one.cpp | 2 +- .../image_pipeline_with_two_image_view.cpp | 2 +- .../src/image_pipeline/image_view_node.cpp | 2 +- .../src/image_pipeline/watermark_node.cpp | 2 +- pendulum_control/src/pendulum_demo.cpp | 14 +++++++------- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/intra_process_demo/src/image_pipeline/camera_node.cpp b/intra_process_demo/src/image_pipeline/camera_node.cpp index 1d278fff5..a1f88139b 100644 --- a/intra_process_demo/src/image_pipeline/camera_node.cpp +++ b/intra_process_demo/src/image_pipeline/camera_node.cpp @@ -16,7 +16,7 @@ #include "image_pipeline/camera_node.hpp" -#include +#include "rclcpp/rclcpp.hpp" int main(int argc, char ** argv) { diff --git a/intra_process_demo/src/image_pipeline/image_pipeline_all_in_one.cpp b/intra_process_demo/src/image_pipeline/image_pipeline_all_in_one.cpp index caaca1661..f93ee0f94 100644 --- a/intra_process_demo/src/image_pipeline/image_pipeline_all_in_one.cpp +++ b/intra_process_demo/src/image_pipeline/image_pipeline_all_in_one.cpp @@ -14,7 +14,7 @@ #include -#include +#include "rclcpp/rclcpp.hpp" #include "image_pipeline/camera_node.hpp" #include "image_pipeline/image_view_node.hpp" diff --git a/intra_process_demo/src/image_pipeline/image_pipeline_with_two_image_view.cpp b/intra_process_demo/src/image_pipeline/image_pipeline_with_two_image_view.cpp index 522656e25..19aeeb14c 100644 --- a/intra_process_demo/src/image_pipeline/image_pipeline_with_two_image_view.cpp +++ b/intra_process_demo/src/image_pipeline/image_pipeline_with_two_image_view.cpp @@ -14,7 +14,7 @@ #include -#include +#include "rclcpp/rclcpp.hpp" #include "image_pipeline/camera_node.hpp" #include "image_pipeline/image_view_node.hpp" diff --git a/intra_process_demo/src/image_pipeline/image_view_node.cpp b/intra_process_demo/src/image_pipeline/image_view_node.cpp index d172ef017..130966887 100644 --- a/intra_process_demo/src/image_pipeline/image_view_node.cpp +++ b/intra_process_demo/src/image_pipeline/image_view_node.cpp @@ -16,7 +16,7 @@ #include "image_pipeline/image_view_node.hpp" -#include +#include "rclcpp/rclcpp.hpp" int main(int argc, char ** argv) { diff --git a/intra_process_demo/src/image_pipeline/watermark_node.cpp b/intra_process_demo/src/image_pipeline/watermark_node.cpp index 1824f7612..80900570e 100644 --- a/intra_process_demo/src/image_pipeline/watermark_node.cpp +++ b/intra_process_demo/src/image_pipeline/watermark_node.cpp @@ -16,7 +16,7 @@ #include "image_pipeline/watermark_node.hpp" -#include +#include "rclcpp/rclcpp.hpp" int main(int argc, char ** argv) { diff --git a/pendulum_control/src/pendulum_demo.cpp b/pendulum_control/src/pendulum_demo.cpp index 63b0b19a2..ba0f72c7d 100644 --- a/pendulum_control/src/pendulum_demo.cpp +++ b/pendulum_control/src/pendulum_demo.cpp @@ -20,15 +20,15 @@ #include "rttest/rttest.h" -#include -#include -#include +#include "rclcpp/rclcpp.hpp" +#include "rclcpp/strategies/message_pool_memory_strategy.hpp" +#include "rclcpp/strategies/allocator_memory_strategy.hpp" -#include +#include "tlsf_cpp/tlsf.hpp" -#include -#include -#include +#include "pendulum_msgs/msg/joint_command.hpp" +#include "pendulum_msgs/msg/joint_state.hpp" +#include "pendulum_msgs/msg/rttest_results.hpp" #include "pendulum_control/pendulum_controller.hpp" #include "pendulum_control/pendulum_motor.hpp"