From d25f7b8ed3df8b53f46b7c8a08c6a5539adac750 Mon Sep 17 00:00:00 2001 From: Gustavo Jose de Sousa <gustavo.sousa@intel.com> Date: Tue, 11 Aug 2015 16:28:42 +1000 Subject: [PATCH] AP_Arming: standardize inclusion of libaries headers This commit changes the way libraries headers are included in source files: - If the header is in the same directory the source belongs to, so the notation '#include ""' is used with the path relative to the directory containing the source. - If the header is outside the directory containing the source, then we use the notation '#include <>' with the path relative to libraries folder. Some of the advantages of such approach: - Only one search path for libraries headers. - OSs like Windows may have a better lookup time. --- libraries/AP_Arming/AP_Arming.cpp | 4 ++-- libraries/AP_Arming/AP_Arming.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/AP_Arming/AP_Arming.cpp b/libraries/AP_Arming/AP_Arming.cpp index 115caf5d2d..b350454cf8 100644 --- a/libraries/AP_Arming/AP_Arming.cpp +++ b/libraries/AP_Arming/AP_Arming.cpp @@ -14,8 +14,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <AP_Arming.h> -#include <AP_Notify.h> +#include "AP_Arming.h" +#include <AP_Notify/AP_Notify.h> extern const AP_HAL::HAL& hal; diff --git a/libraries/AP_Arming/AP_Arming.h b/libraries/AP_Arming/AP_Arming.h index 787e5a1af6..17d9e7d077 100644 --- a/libraries/AP_Arming/AP_Arming.h +++ b/libraries/AP_Arming/AP_Arming.h @@ -3,10 +3,10 @@ #ifndef __AP_ARMING_H__ #define __AP_ARMING_H__ -#include <AP_AHRS.h> -#include <AP_HAL.h> -#include <AP_Param.h> -#include <GCS_MAVLink.h> +#include <AP_AHRS/AP_AHRS.h> +#include <AP_HAL/AP_HAL.h> +#include <AP_Param/AP_Param.h> +#include <GCS_MAVLink/GCS_MAVLink.h> class AP_Arming { public: