From e88ba38595e4df88dbe162c593a116ccd0dae9c4 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Wed, 17 Feb 2016 23:26:00 -0200 Subject: [PATCH] ArduCopter: replace header guard with pragma once --- ArduCopter/Copter.h | 6 +----- ArduCopter/Parameters.h | 7 +------ ArduCopter/config.h | 6 ++---- ArduCopter/defines.h | 6 +----- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/ArduCopter/Copter.h b/ArduCopter/Copter.h index 6e83f5c199..284ff0fe67 100644 --- a/ArduCopter/Copter.h +++ b/ArduCopter/Copter.h @@ -1,7 +1,5 @@ /// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- - -#ifndef _COPTER_H -#define _COPTER_H +#pragma once #define THISFIRMWARE "APM:Copter V3.4-dev" #define FIRMWARE_VERSION 3,4,0,FIRMWARE_VERSION_TYPE_DEV @@ -1068,5 +1066,3 @@ extern Copter copter; using AP_HAL::millis; using AP_HAL::micros; - -#endif // _COPTER_H_ diff --git a/ArduCopter/Parameters.h b/ArduCopter/Parameters.h index 7e13ce2f95..e1b70fbd8e 100644 --- a/ArduCopter/Parameters.h +++ b/ArduCopter/Parameters.h @@ -1,7 +1,5 @@ // -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- - -#ifndef PARAMETERS_H -#define PARAMETERS_H +#pragma once #include @@ -589,6 +587,3 @@ public: }; extern const AP_Param::Info var_info[]; - -#endif // PARAMETERS_H - diff --git a/ArduCopter/config.h b/ArduCopter/config.h index 484eb1654c..d54aaa4fe8 100644 --- a/ArduCopter/config.h +++ b/ArduCopter/config.h @@ -1,7 +1,7 @@ // -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- // -#ifndef __ARDUCOPTER_CONFIG_H__ -#define __ARDUCOPTER_CONFIG_H__ +#pragma once + ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// // @@ -769,5 +769,3 @@ #else #define FIRMWARE_STRING THISFIRMWARE " (" GIT_VERSION ")" #endif - -#endif // __ARDUCOPTER_CONFIG_H__ diff --git a/ArduCopter/defines.h b/ArduCopter/defines.h index 067ba811c7..2497fe07b9 100644 --- a/ArduCopter/defines.h +++ b/ArduCopter/defines.h @@ -1,7 +1,5 @@ // -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- - -#ifndef _DEFINES_H -#define _DEFINES_H +#pragma once #include @@ -436,5 +434,3 @@ enum ThrowModeState { // for PILOT_THR_BHV parameter #define THR_BEHAVE_FEEDBACK_FROM_MID_STICK (1<<0) #define THR_BEHAVE_HIGH_THROTTLE_CANCELS_LAND (1<<1) - -#endif // _DEFINES_H