From 98904825cbaaa6261afd2f9f32e5fed3128c3521 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Wed, 17 Feb 2016 23:25:53 -0200 Subject: [PATCH] Filter: replace header guard with pragma once --- libraries/Filter/AverageFilter.h | 6 +----- libraries/Filter/Butter.h | 6 +----- libraries/Filter/DerivativeFilter.h | 8 +------- libraries/Filter/Filter.h | 7 +------ libraries/Filter/FilterClass.h | 7 +------ libraries/Filter/FilterWithBuffer.h | 9 +-------- libraries/Filter/LowPassFilter.h | 7 +------ libraries/Filter/LowPassFilter2p.h | 7 +------ libraries/Filter/ModeFilter.h | 6 +----- 9 files changed, 9 insertions(+), 54 deletions(-) diff --git a/libraries/Filter/AverageFilter.h b/libraries/Filter/AverageFilter.h index 841a003b51..34a02bb84a 100644 --- a/libraries/Filter/AverageFilter.h +++ b/libraries/Filter/AverageFilter.h @@ -17,9 +17,7 @@ // /// @file AverageFilter.h /// @brief A class to provide the average of a number of samples - -#ifndef __AVERAGE_FILTER_H__ -#define __AVERAGE_FILTER_H__ +#pragma once #include "FilterClass.h" #include "FilterWithBuffer.h" @@ -107,5 +105,3 @@ void AverageFilter:: reset() // clear our variable _num_samples = 0; } - -#endif // __AVERAGE_FILTER_H__ diff --git a/libraries/Filter/Butter.h b/libraries/Filter/Butter.h index 1a49617bc3..02eb2e064d 100644 --- a/libraries/Filter/Butter.h +++ b/libraries/Filter/Butter.h @@ -1,6 +1,4 @@ - -#ifndef __FILTER_BUTTER_H__ -#define __FILTER_BUTTER_H__ +#pragma once #include @@ -107,5 +105,3 @@ struct butter50_8_coeffs }; typedef Butter2 butter50hz8_0; //50hz sample, 8hz fcut typedef Butter2 butter10hz1_6; //10hz sample, 1.6hz fcut - -#endif // __FILTER_BUTTER_H__ diff --git a/libraries/Filter/DerivativeFilter.h b/libraries/Filter/DerivativeFilter.h index 3c69c712cc..7aa5695cb5 100644 --- a/libraries/Filter/DerivativeFilter.h +++ b/libraries/Filter/DerivativeFilter.h @@ -18,9 +18,7 @@ /// @file Derivative.h /// @brief A class to implement a derivative (slope) filter /// See http://www.holoborodko.com/pavel/numerical-methods/numerical-derivative/smooth-low-noise-differentiators/ - -#ifndef __DERIVATIVE_FILTER_H__ -#define __DERIVATIVE_FILTER_H__ +#pragma once #include "FilterClass.h" #include "FilterWithBuffer.h" @@ -56,7 +54,3 @@ private: typedef DerivativeFilter DerivativeFilterFloat_Size5; typedef DerivativeFilter DerivativeFilterFloat_Size7; typedef DerivativeFilter DerivativeFilterFloat_Size9; - - -#endif // __DERIVATIVE_FILTER_H__ - diff --git a/libraries/Filter/Filter.h b/libraries/Filter/Filter.h index 8cdd17f83c..7f11ed4852 100644 --- a/libraries/Filter/Filter.h +++ b/libraries/Filter/Filter.h @@ -1,6 +1,4 @@ - -#ifndef __FILTER_H__ -#define __FILTER_H__ +#pragma once /* Umbrella header for the Filter library */ @@ -11,6 +9,3 @@ #include "LowPassFilter.h" #include "ModeFilter.h" #include "Butter.h" - -#endif //__FILTER_H__ - diff --git a/libraries/Filter/FilterClass.h b/libraries/Filter/FilterClass.h index 8e4946f508..6e5ddea78f 100644 --- a/libraries/Filter/FilterClass.h +++ b/libraries/Filter/FilterClass.h @@ -18,9 +18,7 @@ /// @file FilterClass.h /// @brief A pure virtual interface class /// - -#ifndef __FILTER_CLASS_H__ -#define __FILTER_CLASS_H__ +#pragma once #include @@ -43,6 +41,3 @@ typedef Filter FilterInt16; typedef Filter FilterUInt16; typedef Filter FilterInt32; typedef Filter FilterUInt32; - -#endif // __FILTER_CLASS_H__ - diff --git a/libraries/Filter/FilterWithBuffer.h b/libraries/Filter/FilterWithBuffer.h index 4076b2e2b3..b463a95177 100644 --- a/libraries/Filter/FilterWithBuffer.h +++ b/libraries/Filter/FilterWithBuffer.h @@ -20,9 +20,7 @@ /// This is implemented separately to the base Filter class to get around /// restrictions caused by the use of templates which makes different sizes essentially /// completely different classes - -#ifndef __FILTER_WITH_BUFFER_H__ -#define __FILTER_WITH_BUFFER_H__ +#pragma once #include "FilterClass.h" @@ -116,8 +114,3 @@ T FilterWithBuffer:: apply(T sample) // base class doesn't know what filtering to do so we just return the raw sample return sample; } - -#endif - - - diff --git a/libraries/Filter/LowPassFilter.h b/libraries/Filter/LowPassFilter.h index b213322d2c..13635572db 100644 --- a/libraries/Filter/LowPassFilter.h +++ b/libraries/Filter/LowPassFilter.h @@ -19,9 +19,7 @@ /// @brief A class to implement a low pass filter without losing precision even for int types /// the downside being that it's a little slower as it internally uses a float /// and it consumes an extra 4 bytes of memory to hold the constant gain - -#ifndef __LOW_PASS_FILTER_H__ -#define __LOW_PASS_FILTER_H__ +#pragma once #include #include "FilterClass.h" @@ -88,6 +86,3 @@ typedef LowPassFilter LowPassFilterLong; typedef LowPassFilter LowPassFilterFloat; typedef LowPassFilter LowPassFilterVector2f; typedef LowPassFilter LowPassFilterVector3f; - -#endif // __LOW_PASS_FILTER_H__ - diff --git a/libraries/Filter/LowPassFilter2p.h b/libraries/Filter/LowPassFilter2p.h index dde70d21f3..8f2bc10d50 100644 --- a/libraries/Filter/LowPassFilter2p.h +++ b/libraries/Filter/LowPassFilter2p.h @@ -14,9 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ - -#ifndef LOWPASSFILTER2P_H -#define LOWPASSFILTER2P_H +#pragma once #include #include @@ -91,6 +89,3 @@ typedef LowPassFilter2p LowPassFilter2pLong; typedef LowPassFilter2p LowPassFilter2pFloat; typedef LowPassFilter2p LowPassFilter2pVector2f; typedef LowPassFilter2p LowPassFilter2pVector3f; - - -#endif // LOWPASSFILTER2P_H diff --git a/libraries/Filter/ModeFilter.h b/libraries/Filter/ModeFilter.h index f981825b41..90d61971e3 100644 --- a/libraries/Filter/ModeFilter.h +++ b/libraries/Filter/ModeFilter.h @@ -18,9 +18,7 @@ /// @file ModeFilter.h /// @brief A class to apply a mode filter which is basically picking the median value from the last x samples /// the filter size (i.e buffer size) should always be an odd number - -#ifndef __MODE_FILTER_H__ -#define __MODE_FILTER_H__ +#pragma once #include #include "FilterClass.h" @@ -154,5 +152,3 @@ void ModeFilter:: isort(T new_sample, bool drop_high) FilterWithBuffer::samples[i] = new_sample; } } - -#endif // __MODE_FILTER_H__