From bcdc3336dee78e54132d84beabb42cc73b2bac3c Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Wed, 17 Feb 2016 23:25:28 -0200
Subject: [PATCH] AP_HAL_SITL: replace header guard with pragma once

---
 libraries/AP_HAL_SITL/AP_HAL_SITL.h           | 7 +------
 libraries/AP_HAL_SITL/AP_HAL_SITL_Namespace.h | 6 +-----
 libraries/AP_HAL_SITL/AP_HAL_SITL_Private.h   | 7 +------
 libraries/AP_HAL_SITL/AnalogIn.h              | 6 +-----
 libraries/AP_HAL_SITL/RCOutput.h              | 6 +-----
 libraries/AP_HAL_SITL/SITL_State.h            | 6 +-----
 libraries/AP_HAL_SITL/Storage.h               | 7 +------
 libraries/AP_HAL_SITL/UARTDriver.h            | 5 +----
 libraries/AP_HAL_SITL/Util.h                  | 6 +-----
 libraries/AP_HAL_SITL/fenv_polyfill.h         | 7 +------
 10 files changed, 10 insertions(+), 53 deletions(-)

diff --git a/libraries/AP_HAL_SITL/AP_HAL_SITL.h b/libraries/AP_HAL_SITL/AP_HAL_SITL.h
index 99186d548f..68a4ea08fc 100644
--- a/libraries/AP_HAL_SITL/AP_HAL_SITL.h
+++ b/libraries/AP_HAL_SITL/AP_HAL_SITL.h
@@ -1,6 +1,4 @@
-
-#ifndef __AP_HAL_SITL_H__
-#define __AP_HAL_SITL_H__
+#pragma once
 
 #include <AP_HAL/AP_HAL.h>
 
@@ -9,6 +7,3 @@
 #include "HAL_SITL_Class.h"
 
 #endif // CONFIG_HAL_BOARD
-
-#endif // __AP_HAL_SITL_H__
-
diff --git a/libraries/AP_HAL_SITL/AP_HAL_SITL_Namespace.h b/libraries/AP_HAL_SITL/AP_HAL_SITL_Namespace.h
index 8c744f518f..fd7ba7d3d8 100644
--- a/libraries/AP_HAL_SITL/AP_HAL_SITL_Namespace.h
+++ b/libraries/AP_HAL_SITL/AP_HAL_SITL_Namespace.h
@@ -1,6 +1,4 @@
-
-#ifndef __AP_HAL_SITL_NAMESPACE_H__
-#define __AP_HAL_SITL_NAMESPACE_H__
+#pragma once
 
 namespace HALSITL {
 class UARTDriver;
@@ -15,5 +13,3 @@ class RCInput;
 class Util;
 class Semaphore;
 }
-
-#endif // __AP_HAL_SITL_NAMESPACE_H__
diff --git a/libraries/AP_HAL_SITL/AP_HAL_SITL_Private.h b/libraries/AP_HAL_SITL/AP_HAL_SITL_Private.h
index a08c610197..cc21c097f4 100644
--- a/libraries/AP_HAL_SITL/AP_HAL_SITL_Private.h
+++ b/libraries/AP_HAL_SITL/AP_HAL_SITL_Private.h
@@ -1,6 +1,4 @@
-
-#ifndef __AP_HAL_SITL_PRIVATE_H__
-#define __AP_HAL_SITL_PRIVATE_H__
+#pragma once
 
 #include "AP_HAL_SITL_Namespace.h"
 #include "Scheduler.h"
@@ -8,6 +6,3 @@
 #include "UARTDriver.h"
 #include "SITL_State.h"
 #include "Semaphores.h"
-
-#endif // __AP_HAL_SITL_PRIVATE_H__
-
diff --git a/libraries/AP_HAL_SITL/AnalogIn.h b/libraries/AP_HAL_SITL/AnalogIn.h
index 5f4af4a1ce..936fcea1d6 100644
--- a/libraries/AP_HAL_SITL/AnalogIn.h
+++ b/libraries/AP_HAL_SITL/AnalogIn.h
@@ -1,6 +1,4 @@
-
-#ifndef __AP_HAL_SITL_ANALOG_IN_H__
-#define __AP_HAL_SITL_ANALOG_IN_H__
+#pragma once
 
 #include <AP_HAL/AP_HAL.h>
 #include "AP_HAL_SITL_Namespace.h"
@@ -46,5 +44,3 @@ private:
     static ADCSource* _channels[SITL_INPUT_MAX_CHANNELS];
     SITL_State *_sitlState;
 };
-
-#endif // __AP_HAL_SITL_ANALOG_IN_H__
diff --git a/libraries/AP_HAL_SITL/RCOutput.h b/libraries/AP_HAL_SITL/RCOutput.h
index 9ef5fa2375..85f9ab14ab 100644
--- a/libraries/AP_HAL_SITL/RCOutput.h
+++ b/libraries/AP_HAL_SITL/RCOutput.h
@@ -1,6 +1,4 @@
-
-#ifndef __AP_HAL_SITL_RCOUTPUT_H__
-#define __AP_HAL_SITL_RCOUTPUT_H__
+#pragma once
 
 #include <AP_HAL/AP_HAL.h>
 #if CONFIG_HAL_BOARD == HAL_BOARD_SITL
@@ -28,5 +26,3 @@ private:
 };
 
 #endif
-#endif // __AP_HAL_SITL_RCOUTPUT_H__
-
diff --git a/libraries/AP_HAL_SITL/SITL_State.h b/libraries/AP_HAL_SITL/SITL_State.h
index d3c165b6a0..40ed003b3c 100644
--- a/libraries/AP_HAL_SITL/SITL_State.h
+++ b/libraries/AP_HAL_SITL/SITL_State.h
@@ -1,6 +1,4 @@
-
-#ifndef __AP_HAL_SITL_STATE_H__
-#define __AP_HAL_SITL_STATE_H__
+#pragma once
 
 #include <AP_HAL/AP_HAL.h>
 
@@ -219,5 +217,3 @@ private:
 };
 
 #endif // CONFIG_HAL_BOARD == HAL_BOARD_SITL
-#endif // __AP_HAL_SITL_STATE_H__
-
diff --git a/libraries/AP_HAL_SITL/Storage.h b/libraries/AP_HAL_SITL/Storage.h
index db70f72bed..4cffb0ac01 100644
--- a/libraries/AP_HAL_SITL/Storage.h
+++ b/libraries/AP_HAL_SITL/Storage.h
@@ -1,7 +1,4 @@
-
-
-#ifndef __AP_HAL_SITL_STORAGE_H__
-#define __AP_HAL_SITL_STORAGE_H__
+#pragma once
 
 #include <AP_HAL/AP_HAL.h>
 #include "AP_HAL_SITL_Namespace.h"
@@ -19,5 +16,3 @@ private:
     int _eeprom_fd;
     void _eeprom_open(void);
 };
-
-#endif // __AP_HAL_SITL_STORAGE_H__
diff --git a/libraries/AP_HAL_SITL/UARTDriver.h b/libraries/AP_HAL_SITL/UARTDriver.h
index 99073358b5..7d1c9e9a59 100644
--- a/libraries/AP_HAL_SITL/UARTDriver.h
+++ b/libraries/AP_HAL_SITL/UARTDriver.h
@@ -1,7 +1,6 @@
 /// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
+#pragma once
 
-#ifndef __AP_HAL_SITL_UART_DRIVER_H__
-#define __AP_HAL_SITL_UART_DRIVER_H__
 #include <AP_HAL/AP_HAL.h>
 #if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 
@@ -101,5 +100,3 @@ private:
 };
 
 #endif
-#endif // __AP_HAL_SITL_UART_DRIVER_H__
-
diff --git a/libraries/AP_HAL_SITL/Util.h b/libraries/AP_HAL_SITL/Util.h
index 5606aaa024..26821ebcef 100644
--- a/libraries/AP_HAL_SITL/Util.h
+++ b/libraries/AP_HAL_SITL/Util.h
@@ -1,6 +1,4 @@
-
-#ifndef __AP_HAL_SITL_UTIL_H__
-#define __AP_HAL_SITL_UTIL_H__
+#pragma once
 
 #include <AP_HAL/AP_HAL.h>
 #include "AP_HAL_SITL_Namespace.h"
@@ -33,5 +31,3 @@ public:
 private:
     SITL_State *sitlState;
 };
-
-#endif // __AP_HAL_SITL_UTIL_H__
diff --git a/libraries/AP_HAL_SITL/fenv_polyfill.h b/libraries/AP_HAL_SITL/fenv_polyfill.h
index cfa8b9991a..6c3ef1be71 100644
--- a/libraries/AP_HAL_SITL/fenv_polyfill.h
+++ b/libraries/AP_HAL_SITL/fenv_polyfill.h
@@ -1,6 +1,4 @@
-
-#ifndef __FENV_POLYFILL_H__
-#define __FENV_POLYFILL_H__
+#pragma once
 
 #if (defined __APPLE__) && (defined(__i386__) || defined(__x86_64__))
 
@@ -27,6 +25,3 @@ feenableexcept (unsigned int excepts)
 }
 
 #endif // APPLE
-
-#endif // __FENV_POLYFILL_H__
-