From 79837c343f3a1fbfb2b3e280d74f5bc3921c3328 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Wed, 17 Feb 2016 23:25:30 -0200 Subject: [PATCH] AP_InertialNav: replace header guard with pragma once --- libraries/AP_InertialNav/AP_InertialNav.h | 6 +----- libraries/AP_InertialNav/AP_InertialNav_NavEKF.h | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/libraries/AP_InertialNav/AP_InertialNav.h b/libraries/AP_InertialNav/AP_InertialNav.h index 12eea2dc01..d5da655bba 100644 --- a/libraries/AP_InertialNav/AP_InertialNav.h +++ b/libraries/AP_InertialNav/AP_InertialNav.h @@ -1,7 +1,5 @@ /// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- - -#ifndef __AP_INERTIALNAV_H__ -#define __AP_INERTIALNAV_H__ +#pragma once #include #include // ArduPilot Mega IMU Library @@ -120,5 +118,3 @@ public: #if AP_AHRS_NAVEKF_AVAILABLE #include "AP_InertialNav_NavEKF.h" #endif - -#endif // __AP_INERTIALNAV_H__ diff --git a/libraries/AP_InertialNav/AP_InertialNav_NavEKF.h b/libraries/AP_InertialNav/AP_InertialNav_NavEKF.h index 39d436c6c7..9e338d2c3b 100644 --- a/libraries/AP_InertialNav/AP_InertialNav_NavEKF.h +++ b/libraries/AP_InertialNav/AP_InertialNav_NavEKF.h @@ -5,10 +5,7 @@ filter if available, and falls back to the AP_InertialNav filter when EKF is not available */ - - -#ifndef __AP_INERTIALNAV_NAVEKF_H__ -#define __AP_INERTIALNAV_NAVEKF_H__ +#pragma once #include // definitions shared by inertial and ekf nav filters @@ -124,5 +121,3 @@ private: bool _haveabspos; AP_AHRS_NavEKF &_ahrs_ekf; }; - -#endif // __AP_INERTIALNAV_NAVEKF_H__