From f42484bcc5e272a5fde75395ebcb3877bbff61ed Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Wed, 17 Feb 2016 23:24:42 -0200 Subject: [PATCH] AC_AttitudeControl: replace header guard with pragma once --- libraries/AC_AttitudeControl/AC_AttitudeControl.h | 6 +----- libraries/AC_AttitudeControl/AC_AttitudeControl_Heli.h | 6 +----- libraries/AC_AttitudeControl/AC_AttitudeControl_Multi.h | 6 +----- libraries/AC_AttitudeControl/AC_PosControl.h | 4 +--- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/libraries/AC_AttitudeControl/AC_AttitudeControl.h b/libraries/AC_AttitudeControl/AC_AttitudeControl.h index eae728ac2a..4d88a50643 100644 --- a/libraries/AC_AttitudeControl/AC_AttitudeControl.h +++ b/libraries/AC_AttitudeControl/AC_AttitudeControl.h @@ -1,11 +1,9 @@ // -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: t -*- +#pragma once /// @file AC_AttitudeControl.h /// @brief ArduCopter attitude control library -#ifndef AC_AttitudeControl_H -#define AC_AttitudeControl_H - #include #include #include @@ -354,5 +352,3 @@ protected: #define AC_ATTITUDE_CONTROL_LOG_FORMAT(msg) { msg, sizeof(AC_AttitudeControl::log_Attitude), \ "ATT", "cccccCC", "RollIn,Roll,PitchIn,Pitch,YawIn,Yaw,NavYaw" } - -#endif //AC_AttitudeControl_H diff --git a/libraries/AC_AttitudeControl/AC_AttitudeControl_Heli.h b/libraries/AC_AttitudeControl/AC_AttitudeControl_Heli.h index 477196834a..f8a2994267 100644 --- a/libraries/AC_AttitudeControl/AC_AttitudeControl_Heli.h +++ b/libraries/AC_AttitudeControl/AC_AttitudeControl_Heli.h @@ -1,11 +1,9 @@ // -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: t -*- +#pragma once /// @file AC_AttitudeControl_Heli.h /// @brief ArduCopter attitude control library for traditional helicopters -#ifndef AC_ATTITUDECONTROL_HELI_H -#define AC_ATTITUDECONTROL_HELI_H - #include "AC_AttitudeControl.h" #include #include @@ -133,5 +131,3 @@ private: LowPassFilterFloat yaw_acceleration_feedforward_filter; }; - -#endif //AC_ATTITUDECONTROL_HELI_H diff --git a/libraries/AC_AttitudeControl/AC_AttitudeControl_Multi.h b/libraries/AC_AttitudeControl/AC_AttitudeControl_Multi.h index dca7ed3bb3..7c76762f8c 100644 --- a/libraries/AC_AttitudeControl/AC_AttitudeControl_Multi.h +++ b/libraries/AC_AttitudeControl/AC_AttitudeControl_Multi.h @@ -1,11 +1,9 @@ // -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: t -*- +#pragma once /// @file AC_AttitudeControl_Multi.h /// @brief ArduCopter attitude control library -#ifndef AC_AttitudeControl_Multi_H -#define AC_AttitudeControl_Multi_H - #include "AC_AttitudeControl.h" #include @@ -34,5 +32,3 @@ protected: AP_MotorsMulticopter& _motors_multi; }; - -#endif // AC_AttitudeControl_Multi_H diff --git a/libraries/AC_AttitudeControl/AC_PosControl.h b/libraries/AC_AttitudeControl/AC_PosControl.h index b1ec34c855..174a067ef1 100644 --- a/libraries/AC_AttitudeControl/AC_PosControl.h +++ b/libraries/AC_AttitudeControl/AC_PosControl.h @@ -1,6 +1,5 @@ /// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- -#ifndef AC_POSCONTROL_H -#define AC_POSCONTROL_H +#pragma once #include #include @@ -407,4 +406,3 @@ private: Vector2f _accel_target_jerk_limited; // acceleration target jerk limited to 100deg/s/s LowPassFilterVector2f _accel_target_filter; // acceleration target filter }; -#endif // AC_POSCONTROL_H