From 7f83db809bd64e0889ef7ec82c3227cfb7aabb1c Mon Sep 17 00:00:00 2001 From: Matt Reynolds Date: Wed, 22 Jan 2020 22:34:36 -0500 Subject: [PATCH] Add missing header guards --- .../ackermann_steering_controller.h | 3 +++ .../test/common/include/ackermann_steering_bot.h | 5 ++++- .../test/common/include/test_common.h | 3 +++ .../include/diff_drive_controller/diff_drive_controller.h | 5 ++++- diff_drive_controller/test/diffbot.h | 3 +++ diff_drive_controller/test/test_common.h | 4 +++- .../four_wheel_steering_controller.h | 3 +++ .../test/src/four_wheel_steering.h | 3 +++ four_wheel_steering_controller/test/src/test_common.h | 4 +++- 9 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ackermann_steering_controller/include/ackermann_steering_controller/ackermann_steering_controller.h b/ackermann_steering_controller/include/ackermann_steering_controller/ackermann_steering_controller.h index 6924ef00e..7894f2dbe 100644 --- a/ackermann_steering_controller/include/ackermann_steering_controller/ackermann_steering_controller.h +++ b/ackermann_steering_controller/include/ackermann_steering_controller/ackermann_steering_controller.h @@ -36,6 +36,9 @@ * Author: Masaru Morita, Bence Magyar, Enrique Fernández */ +#pragma once + + #include #include #include diff --git a/ackermann_steering_controller/test/common/include/ackermann_steering_bot.h b/ackermann_steering_controller/test/common/include/ackermann_steering_bot.h index ad5048f57..db0520f62 100644 --- a/ackermann_steering_controller/test/common/include/ackermann_steering_bot.h +++ b/ackermann_steering_controller/test/common/include/ackermann_steering_bot.h @@ -29,6 +29,9 @@ // NOTE: The contents of this file have been taken largely from the ros_control wiki tutorials +#pragma once + + // ROS #include #include @@ -197,7 +200,7 @@ class AckermannSteeringBot : public hardware_interface::RobotHW } private: - + void cleanUp() { // wheel diff --git a/ackermann_steering_controller/test/common/include/test_common.h b/ackermann_steering_controller/test/common/include/test_common.h index 196d5ce1c..9927b6304 100644 --- a/ackermann_steering_controller/test/common/include/test_common.h +++ b/ackermann_steering_controller/test/common/include/test_common.h @@ -28,6 +28,9 @@ /// \author Bence Magyar /// \author Masaru Morita +#pragma once + + #include #include #include diff --git a/diff_drive_controller/include/diff_drive_controller/diff_drive_controller.h b/diff_drive_controller/include/diff_drive_controller/diff_drive_controller.h index 0c091564c..a5d8e50cc 100644 --- a/diff_drive_controller/include/diff_drive_controller/diff_drive_controller.h +++ b/diff_drive_controller/include/diff_drive_controller/diff_drive_controller.h @@ -36,6 +36,9 @@ * Author: Bence Magyar, Enrique Fernández */ +#pragma once + + #include #include #include @@ -231,7 +234,7 @@ namespace diff_drive_controller{ /// Dynamic Reconfigure server typedef dynamic_reconfigure::Server ReconfigureServer; - + std::shared_ptr dyn_reconf_server_; private: diff --git a/diff_drive_controller/test/diffbot.h b/diff_drive_controller/test/diffbot.h index bfce6b3bb..241bbb185 100644 --- a/diff_drive_controller/test/diffbot.h +++ b/diff_drive_controller/test/diffbot.h @@ -27,6 +27,9 @@ // NOTE: The contents of this file have been taken largely from the ros_control wiki tutorials +#pragma once + + // ROS #include #include diff --git a/diff_drive_controller/test/test_common.h b/diff_drive_controller/test/test_common.h index 276570764..76e21d80c 100644 --- a/diff_drive_controller/test/test_common.h +++ b/diff_drive_controller/test/test_common.h @@ -27,6 +27,9 @@ /// \author Bence Magyar +#pragma once + + #include #include @@ -157,4 +160,3 @@ inline tf::Quaternion tfQuatFromGeomQuat(const geometry_msgs::Quaternion& quat) { return tf::Quaternion(quat.x, quat.y, quat.z, quat.w); } - diff --git a/four_wheel_steering_controller/include/four_wheel_steering_controller/four_wheel_steering_controller.h b/four_wheel_steering_controller/include/four_wheel_steering_controller/four_wheel_steering_controller.h index 4a65251ba..5b421a6e1 100644 --- a/four_wheel_steering_controller/include/four_wheel_steering_controller/four_wheel_steering_controller.h +++ b/four_wheel_steering_controller/include/four_wheel_steering_controller/four_wheel_steering_controller.h @@ -33,6 +33,9 @@ * POSSIBILITY OF SUCH DAMAGE. *********************************************************************/ +#pragma once + + #include #include #include diff --git a/four_wheel_steering_controller/test/src/four_wheel_steering.h b/four_wheel_steering_controller/test/src/four_wheel_steering.h index 70e660352..5c66525cb 100644 --- a/four_wheel_steering_controller/test/src/four_wheel_steering.h +++ b/four_wheel_steering_controller/test/src/four_wheel_steering.h @@ -1,5 +1,8 @@ // NOTE: The contents of this file have been taken largely from the ros_control wiki tutorials +#pragma once + + // ROS #include #include diff --git a/four_wheel_steering_controller/test/src/test_common.h b/four_wheel_steering_controller/test/src/test_common.h index 2c1c2dce2..c9d54cb62 100644 --- a/four_wheel_steering_controller/test/src/test_common.h +++ b/four_wheel_steering_controller/test/src/test_common.h @@ -27,6 +27,9 @@ /// \author Bence Magyar +#pragma once + + #include #include @@ -131,4 +134,3 @@ inline tf::Quaternion tfQuatFromGeomQuat(const geometry_msgs::Quaternion& quat) { return tf::Quaternion(quat.x, quat.y, quat.z, quat.w); } -