Changed header guards to be GCC compliant.

include/etl/algorithm.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ALGORITHM__
-#define __ETL_ALGORITHM__
+#ifndef ETL_ALGORITHM_INCLUDED
+#define ETL_ALGORITHM_INCLUDED
 
 ///\defgroup algorithm algorithm
 /// Reverse engineered algorithms from C++ 0x11

include/etl/alignment.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ALIGNEMENT__
-#define __ETL_ALIGNEMENT__
+#ifndef ETL_ALIGNEMENT_INCLUDED
+#define ETL_ALIGNEMENT_INCLUDED
 
 #include <stdint.h>
 
@@ -43,7 +43,7 @@ SOFTWARE.
 
 namespace etl
 {
-  namespace __private_alignment__
+  namespace private_alignment
   {
     //***************************************************************************
     // Matcher.
@@ -99,7 +99,7 @@ namespace etl
   {
   public:
 
-    typedef typename __private_alignment__::type_with_alignment_helper<ALIGNMENT, int_least8_t, int_least16_t, int32_t, int64_t, float, double, void*>::type type;
+    typedef typename private_alignment::type_with_alignment_helper<ALIGNMENT, int_least8_t, int_least16_t, int32_t, int64_t, float, double, void*>::type type;
   };
 
   //***************************************************************************
@@ -183,7 +183,7 @@ namespace etl
       union
       {
         char data[LENGTH];
-        typename etl::type_with_alignment<ALIGNMENT>::type __etl_alignment_type__; // A POD type that has the same alignment as ALIGNMENT.
+        typename etl::type_with_alignment<ALIGNMENT>::type etl_alignment_type; // A POD type that has the same alignment as ALIGNMENT.
       };
     };
   };

include/etl/array.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ARRAY__
-#define __ETL_ARRAY__
+#ifndef ETL_ARRAY_INCLUDED
+#define ETL_ARRAY_INCLUDED
 
 #include <iterator>
 #include <functional>

include/etl/array_view.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ARRAY_VIEW__
-#define __ETL_ARRAY_VIEW__
+#ifndef ETL_ARRAY_VIEW_INCLUDED
+#define ETL_ARRAY_VIEW_INCLUDED
 
 #include "platform.h"
 #include "memory.h"
@@ -832,7 +832,7 @@ namespace etl
   {
     size_t operator()(const etl::array_view<T>& view) const
     {
-      return etl::__private_hash__::generic_hash<size_t>(reinterpret_cast<const uint8_t*>(&view[0]),
+      return etl::private_hash::generic_hash<size_t>(reinterpret_cast<const uint8_t*>(&view[0]),
                                                          reinterpret_cast<const uint8_t*>(&view[view.size()]));
     }
   };
@@ -842,7 +842,7 @@ namespace etl
   {
     size_t operator()(const etl::const_array_view<T>& view) const
     {
-      return etl::__private_hash__::generic_hash<size_t>(reinterpret_cast<const uint8_t*>(&view[0]),
+      return etl::private_hash::generic_hash<size_t>(reinterpret_cast<const uint8_t*>(&view[0]),
                                                          reinterpret_cast<const uint8_t*>(&view[view.size()]));
     }
   };

include/etl/array_wrapper.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ARRAY_WRAPPER__
-#define __ETL_ARRAY_WRAPPER__
+#ifndef ETL_ARRAY_WRAPPER_INCLUDED
+#define ETL_ARRAY_WRAPPER_INCLUDED
 
 #include "platform.h"
 #include "iterator.h"
@@ -396,7 +396,7 @@ namespace etl
   {
     size_t operator()(const etl::array_wrapper<T, SIZE, ARRAY>& aw) const
     {
-      return etl::__private_hash__::generic_hash<size_t>(reinterpret_cast<const uint8_t*>(&aw[0]),
+      return etl::private_hash::generic_hash<size_t>(reinterpret_cast<const uint8_t*>(&aw[0]),
                                                          reinterpret_cast<const uint8_t*>(&aw[aw.size()]));
     }
   };

include/etl/atomic.h

@@ -26,8 +26,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ATOMIC__
-#define __ETL_ATOMIC__
+#ifndef ETL_ATOMIC_INCLUDED
+#define ETL_ATOMIC_INCLUDED
 
 #include "platform.h"
 

include/etl/atomic/atomic_arm.h

@@ -26,8 +26,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ATOMIC_ARM__
-#define __ETL_ATOMIC_ARM__
+#ifndef ETL_ATOMIC_ARM_INCLUDED
+#define ETL_ATOMIC_ARM_INCLUDED
 
 #include "atomic_gcc_sync.h"
 

include/etl/atomic/atomic_gcc_sync.h

@@ -26,8 +26,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ATOMIC_GCC_SYNC__
-#define __ETL_ATOMIC_GCC_SYNC__
+#ifndef ETL_ATOMIC_GCC_SYNC_INCLUDED
+#define ETL_ATOMIC_GCC_SYNC_INCLUDED
 
 #include "../platform.h"
 #include "../type_traits.h"

include/etl/atomic/atomic_std.h

@@ -26,8 +26,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ATOMIC_STD__
-#define __ETL_ATOMIC_STD__
+#ifndef ETL_ATOMIC_STD_INCLUDED
+#define ETL_ATOMIC_STD_INCLUDED
 
 #include "../platform.h"
 #include "../nullptr.h"

include/etl/basic_string.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_BASIC_STRING__
-#define __ETL_BASIC_STRING__
+#ifndef ETL_BASIC_STRING_INCLUDED
+#define ETL_BASIC_STRING_INCLUDED
 
 #include <stddef.h>
 #include <stdint.h>

include/etl/binary.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_BINARY__
-#define __ETL_BINARY__
+#ifndef ETL_BINARY_INCLUDED
+#define ETL_BINARY_INCLUDED
 
 ///\defgroup binary binary
 /// Binary utilities

include/etl/bitset.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_BITSET__
-#define __ETL_BITSET__
+#ifndef ETL_BITSET_INCLUDED
+#define ETL_BITSET_INCLUDED
 
 #include <algorithm>
 #include <iterator>

include/etl/bloom_filter.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_BLOOM_FILTER__
-#define __ETL_BLOOM_FILTER__
+#ifndef ETL_BLOOM_FILTER_INCLUDED
+#define ETL_BLOOM_FILTER_INCLUDED
 
 #include "platform.h"
 #include "parameter_type.h"
@@ -45,7 +45,7 @@ SOFTWARE.
 
 namespace etl
 {
-  namespace __private_bloom_filter__
+  namespace private_bloom_filter
   {
     // Placeholder null hash for defaulted template parameters.
     struct null_hash
@@ -71,14 +71,14 @@ namespace etl
   //***************************************************************************
   template <const size_t DESIRED_WIDTH,
             typename     THash1,
-            typename     THash2 = __private_bloom_filter__::null_hash,
-            typename     THash3 = __private_bloom_filter__::null_hash>
+            typename     THash2 = private_bloom_filter::null_hash,
+            typename     THash3 = private_bloom_filter::null_hash>
   class bloom_filter
   {
   private:
 
     typedef typename etl::parameter_type<typename THash1::argument_type>::type parameter_t;
-    typedef __private_bloom_filter__::null_hash null_hash;
+    typedef private_bloom_filter::null_hash null_hash;
 
   public:
 

include/etl/c/ecl_timer.h

@@ -26,8 +26,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_C_TIMER_FRAMEWORK__
-#define __ETL_C_TIMER_FRAMEWORK__
+#ifndef ETL_C_TIMER_FRAMEWORK_INCLUDED
+#define ETL_C_TIMER_FRAMEWORK_INCLUDED
 
 #include <stdint.h>
 

include/etl/callback_timer.h

@@ -26,8 +26,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_CALLBACK_TIMER__
-#define __ETL_CALLBACK_TIMER__
+#ifndef ETL_CALLBACK_TIMER_INCLUDED
+#define ETL_CALLBACK_TIMER_INCLUDED
 
 #include <stdint.h>
 #include <algorithm>
@@ -153,7 +153,7 @@ namespace etl
     callback_timer_data& operator =(const callback_timer_data& other);
   };
 
-  namespace __private_callback_timer__
+  namespace private_callback_timer
   {
     //*************************************************************************
     /// A specialised intrusive linked list for timer data.
@@ -647,7 +647,7 @@ namespace etl
     callback_timer_data* const timer_array;
 
     // The list of active timers.
-    __private_callback_timer__::list active_list;
+    private_callback_timer::list active_list;
 
     volatile bool enabled;
 #if defined(ETL_CALLBACK_TIMER_USE_ATOMIC_LOCK)

include/etl/char_traits.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_CHAR_TRAITS__
-#define __ETL_CHAR_TRAITS__
+#ifndef ETL_CHAR_TRAITS_INCLUDED
+#define ETL_CHAR_TRAITS_INCLUDED
 
 #include <algorithm>
 

include/etl/checksum.h

@@ -24,8 +24,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_CHECKSUM__
-#define __ETL_CHECKSUM__
+#ifndef ETL_CHECKSUM_INCLUDED
+#define ETL_CHECKSUM_INCLUDED
 
 #include <stdint.h>
 

include/etl/combinations.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_COMBINATIONS__
-#define __ETL_COMBINATIONS__
+#ifndef ETL_COMBINATIONS_INCLUDED
+#define ETL_COMBINATIONS_INCLUDED
 
 #include "platform.h"
 #include "permutations.h"

include/etl/compare.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_COMPARE__
-#define __ETL_COMPARE__
+#ifndef ETL_COMPARE_INCLUDED
+#define ETL_COMPARE_INCLUDED
 
 #include <functional>
 

include/etl/constant.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_CONSTANT__
-#define __ETL_CONSTANT__
+#ifndef ETL_CONSTANT_INCLUDED
+#define ETL_CONSTANT_INCLUDED
 
 #include "platform.h"
 

include/etl/container.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_CONTAINER__
-#define __ETL_CONTAINER__
+#ifndef ETL_CONTAINER_INCLUDED
+#define ETL_CONTAINER_INCLUDED
 
 #include <stddef.h>
 #include <iterator>

include/etl/crc16.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_CRC16__
-#define __ETL_CRC16__
+#ifndef ETL_CRC16_INCLUDED
+#define ETL_CRC16_INCLUDED
 
 #include <stdint.h>
 #include <iterator>

include/etl/crc16_ccitt.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_CRC16_CCITT__
-#define __ETL_CRC16_CCITT__
+#ifndef ETL_CRC16_CCITT_INCLUDED
+#define ETL_CRC16_CCITT_INCLUDED
 
 #include <stdint.h>
 #include <iterator>

include/etl/crc16_kermit.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_CRC16_KERMIT__
-#define __ETL_CRC16_KERMIT__
+#ifndef ETL_CRC16_KERMIT_INCLUDED
+#define ETL_CRC16_KERMIT_INCLUDED
 
 #include <stdint.h>
 #include <iterator>

include/etl/crc32.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_CRC32__
-#define __ETL_CRC32__
+#ifndef ETL_CRC32_INCLUDED
+#define ETL_CRC32_INCLUDED
 
 #include <stdint.h>
 #include <iterator>

include/etl/crc64_ecma.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_CRC64_ECMA__
-#define __ETL_CRC64_ECMA__
+#ifndef ETL_CRC64_ECMA_INCLUDED
+#define ETL_CRC64_ECMA_INCLUDED
 
 #include <stdint.h>
 #include <iterator>

include/etl/crc8_ccitt.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_CRC8_CCITT__
-#define __ETL_CRC8_CCITT__
+#ifndef ETL_CRC8_CCITT_INCLUDED
+#define ETL_CRC8_CCITT_INCLUDED
 
 #include <stdint.h>
 #include <iterator>

include/etl/cstring.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_STRING__
-#define __ETL_STRING__
+#ifndef ETL_STRING_INCLUDED
+#define ETL_STRING_INCLUDED
 
 #include "platform.h"
 #include "basic_string.h"
@@ -210,7 +210,7 @@ namespace etl
   {
     size_t operator()(const etl::istring& text) const
     {
-      return etl::__private_hash__::generic_hash<size_t>(reinterpret_cast<const uint8_t*>(&text[0]),
+      return etl::private_hash::generic_hash<size_t>(reinterpret_cast<const uint8_t*>(&text[0]),
                                                          reinterpret_cast<const uint8_t*>(&text[text.size()]));
     }
   };
@@ -220,7 +220,7 @@ namespace etl
   {
     size_t operator()(const etl::string<SIZE>& text) const
     {
-      return etl::__private_hash__::generic_hash<size_t>(reinterpret_cast<const uint8_t*>(&text[0]),
+      return etl::private_hash::generic_hash<size_t>(reinterpret_cast<const uint8_t*>(&text[0]),
                                                          reinterpret_cast<const uint8_t*>(&text[text.size()]));
     }
   };

include/etl/cyclic_value.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_CYCLIC_VALUE__
-#define __ETL_CYCLIC_VALUE__
+#ifndef ETL_CYCLIC_VALUE_INCLUDED
+#define ETL_CYCLIC_VALUE_INCLUDED
 
 #include <stddef.h>
 

include/etl/debounce.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_DEBOUNCE__
-#define __ETL_DEBOUNCE__
+#ifndef ETL_DEBOUNCE_INCLUDED
+#define ETL_DEBOUNCE_INCLUDED
 
 #include <stdint.h>
 
@@ -38,7 +38,7 @@ SOFTWARE.
 
 namespace etl
 {
-  namespace __private_debounce__
+  namespace private_debounce
   {
     class debounce_base
     {
@@ -431,7 +431,7 @@ namespace etl
   /// Fixed Valid/Hold/Repeating values.
   //***************************************************************************
   template <const uint16_t VALID_COUNT = 0, const uint16_t HOLD_COUNT = 0, const uint16_t REPEAT_COUNT = 0>
-  class debounce : public __private_debounce__::debounce4
+  class debounce : public private_debounce::debounce4
   {
   public:
 
@@ -460,7 +460,7 @@ namespace etl
   /// Fixed Valid/Hold values.
   //***************************************************************************
   template <const uint16_t VALID_COUNT, const uint16_t HOLD_COUNT>
-  class debounce<VALID_COUNT, HOLD_COUNT, 0> : public __private_debounce__::debounce3
+  class debounce<VALID_COUNT, HOLD_COUNT, 0> : public private_debounce::debounce3
   {
   public:
 
@@ -492,7 +492,7 @@ namespace etl
   /// Fixed Valid value.
   //***************************************************************************
   template <const uint16_t VALID_COUNT>
-  class debounce<VALID_COUNT, 0, 0> : public __private_debounce__::debounce2
+  class debounce<VALID_COUNT, 0, 0> : public private_debounce::debounce2
   {
   public:
 
@@ -523,7 +523,7 @@ namespace etl
   /// Variable Valid/Hold/Repeating values.
   //***************************************************************************
   template <>
-  class debounce<0, 0, 0> : public __private_debounce__::debounce4
+  class debounce<0, 0, 0> : public private_debounce::debounce4
   {
   public:
 

include/etl/debug_count.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_DEBUG_COUNT__
-#define __ETL_DEBUG_COUNT__
+#ifndef ETL_DEBUG_COUNT_INCLUDED
+#define ETL_DEBUG_COUNT_INCLUDED
 
 #include <stdint.h>
 #include <assert.h>

include/etl/deque.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_DEQUE__
-#define __ETL_DEQUE__
+#ifndef ETL_DEQUE_INCLUDED
+#define ETL_DEQUE_INCLUDED
 
 #include <stddef.h>
 #include <stdint.h>

include/etl/endianness.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ENDIAN__
-#define __ETL_ENDIAN__
+#ifndef ETL_ENDIAN_INCLUDED
+#define ETL_ENDIAN_INCLUDED
 
 #include <stdint.h>
 

include/etl/enum_type.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ENUM_TYPE__
-#define __ETL_ENUM_TYPE__
+#ifndef ETL_ENUM_TYPE_INCLUDED
+#define ETL_ENUM_TYPE_INCLUDED
 
 #include "platform.h"
 

include/etl/error_handler.h

@@ -29,8 +29,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ERROR_HANDLER__
-#define __ETL_ERROR_HANDLER__
+#ifndef ETL_ERROR_HANDLER_INCLUDED
+#define ETL_ERROR_HANDLER_INCLUDED
 
 ///\defgroup error_handler error_handler
 /// Error handler for when throwing exceptions is not required.

include/etl/exception.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_EXCEPTION__
-#define __ETL_EXCEPTION__
+#ifndef ETL_EXCEPTION_INCLUDED
+#define ETL_EXCEPTION_INCLUDED
 
 #include "platform.h"
 

include/etl/factorial.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_FACTORIAL__
-#define __ETL_FACTORIAL__
+#ifndef ETL_FACTORIAL_INCLUDED
+#define ETL_FACTORIAL_INCLUDED
 
 #include <stddef.h>
 

include/etl/fibonacci.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_FIBONACCI__
-#define __ETL_FIBONACCI__
+#ifndef ETL_FIBONACCI_INCLUDED
+#define ETL_FIBONACCI_INCLUDED
 
 #include <stddef.h>
 

include/etl/fixed_iterator.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_FIXED_ITERATOR__
-#define __ETL_FIXED_ITERATOR__
+#ifndef ETL_FIXED_ITERATOR_INCLUDED
+#define ETL_FIXED_ITERATOR_INCLUDED
 
 #include <iterator>
 

include/etl/flat_map.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_FLAT_MAP__
-#define __ETL_FLAT_MAP__
+#ifndef ETL_FLAT_MAP_INCLUDED
+#define ETL_FLAT_MAP_INCLUDED
 
 #include "platform.h"
 #include "reference_flat_map.h"

include/etl/flat_multimap.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_FLAT_MULTMAP__
-#define __ETL_FLAT_MULTMAP__
+#ifndef ETL_FLAT_MULTMAP_INCLUDED
+#define ETL_FLAT_MULTMAP_INCLUDED
 
 #include "platform.h"
 #include "reference_flat_multimap.h"

include/etl/flat_multiset.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_FLAT_MULTISET__
-#define __ETL_FLAT_MULTISET__
+#ifndef ETL_FLAT_MULTISET_INCLUDED
+#define ETL_FLAT_MULTISET_INCLUDED
 
 #include "platform.h"
 #include "reference_flat_multiset.h"

include/etl/flat_set.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_FLAT_SET__
-#define __ETL_FLAT_SET__
+#ifndef ETL_FLAT_SET_INCLUDED
+#define ETL_FLAT_SET_INCLUDED
 
 #include "platform.h"
 #include "reference_flat_set.h"

include/etl/fnv_1.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_FNV_1__
-#define __ETL_FNV_1__
+#ifndef ETL_FNV_1_INCLUDED
+#define ETL_FNV_1_INCLUDED
 
 #include <stdint.h>
 

include/etl/forward_list.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_FORWARD_LIST__
-#define __ETL_FORWARD_LIST__
+#ifndef ETL_FORWARD_LIST_INCLUDED
+#define ETL_FORWARD_LIST_INCLUDED
 
 #include <iterator>
 #include <algorithm>

include/etl/fsm.h

@@ -48,8 +48,8 @@ SOFTWARE.
 // See generate.bat
 //***************************************************************************
 
-#ifndef __ETL_FSM__
-#define __ETL_FSM__
+#ifndef ETL_FSM_INCLUDED
+#define ETL_FSM_INCLUDED
 
 #include <stdint.h>
 

include/etl/fsm_generator.h

@@ -60,8 +60,8 @@ cog.outl("//********************************************************************
 // See generate.bat
 //***************************************************************************
 
-#ifndef __ETL_FSM__
-#define __ETL_FSM__
+#ifndef ETL_FSM_INCLUDED
+#define ETL_FSM_INCLUDED
 
 #include <stdint.h>
 

include/etl/function.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_FUNCTION__
-#define __ETL_FUNCTION__
+#ifndef ETL_FUNCTION_INCLUDED
+#define ETL_FUNCTION_INCLUDED
 
 #include "platform.h"
 

include/etl/functional.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_FUNCTIONAL__
-#define __ETL_FUNCTIONAL__
+#ifndef ETL_FUNCTIONAL_INCLUDED
+#define ETL_FUNCTIONAL_INCLUDED
 
 #include "platform.h"
 

include/etl/hash.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_HASH__
-#define __ETL_HASH__
+#ifndef ETL_HASH_INCLUDED
+#define ETL_HASH_INCLUDED
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -46,7 +46,7 @@ SOFTWARE.
 
 namespace etl
 {
-  namespace __private_hash__
+  namespace private_hash
   {
     //*************************************************************************
     /// Hash to use when size_t is 16 bits.
@@ -242,7 +242,7 @@ namespace etl
       else
       {
         uint8_t* p = reinterpret_cast<uint8_t*>(&v);
-        return __private_hash__::generic_hash<size_t>(p, p + sizeof(v));
+        return private_hash::generic_hash<size_t>(p, p + sizeof(v));
       }
     }
   };
@@ -264,7 +264,7 @@ namespace etl
       else
       {
         uint8_t* p = reinterpret_cast<uint8_t*>(&v);
-        return __private_hash__::generic_hash<size_t>(p, p + sizeof(v));
+        return private_hash::generic_hash<size_t>(p, p + sizeof(v));
       }
     }
   };
@@ -286,7 +286,7 @@ namespace etl
       else
       {
         uint8_t* p = reinterpret_cast<uint8_t*>(&v);
-        return __private_hash__::generic_hash<size_t>(p, p + sizeof(v));
+        return private_hash::generic_hash<size_t>(p, p + sizeof(v));
       }
     }
   };
@@ -308,7 +308,7 @@ namespace etl
       else
       {
         uint8_t* p = reinterpret_cast<uint8_t*>(&v);
-        return __private_hash__::generic_hash<size_t>(p, p + sizeof(v));
+        return private_hash::generic_hash<size_t>(p, p + sizeof(v));
       }
     }
   };
@@ -338,7 +338,7 @@ namespace etl
       else
       {
         uint8_t* p = reinterpret_cast<uint8_t*>(&v);
-        return __private_hash__::generic_hash<size_t>(p, p + sizeof(v));
+        return private_hash::generic_hash<size_t>(p, p + sizeof(v));
       }
     }
   };
@@ -368,7 +368,7 @@ namespace etl
       else
       {
         uint8_t* p = reinterpret_cast<uint8_t*>(&v);
-        return __private_hash__::generic_hash<size_t>(p, p + sizeof(v));
+        return private_hash::generic_hash<size_t>(p, p + sizeof(v));
       }
     }
   };
@@ -398,7 +398,7 @@ namespace etl
       else
       {
         uint8_t* p = reinterpret_cast<uint8_t*>(&v);
-        return __private_hash__::generic_hash<size_t>(p, p + sizeof(v));
+        return private_hash::generic_hash<size_t>(p, p + sizeof(v));
       }
     }
   };
@@ -428,7 +428,7 @@ namespace etl
       else
       {
         uint8_t* p = reinterpret_cast<uint8_t*>(&v);
-        return __private_hash__::generic_hash<size_t>(p, p + sizeof(v));
+        return private_hash::generic_hash<size_t>(p, p + sizeof(v));
       }
     }
   };

include/etl/ihash.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_IHASH__
-#define __ETL_IHASH__
+#ifndef ETL_IHASH_INCLUDED
+#define ETL_IHASH_INCLUDED
 
 #include <stdint.h>
 #include <utility>

include/etl/instance_count.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_INSTANCE_COUNT__
-#define __ETL_INSTANCE_COUNT__
+#ifndef ETL_INSTANCE_COUNT_INCLUDED
+#define ETL_INSTANCE_COUNT_INCLUDED
 
 #include <stdint.h>
 

include/etl/integral_limits.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_INTEGRAL_LIMITS__
-#define __ETL_INTEGRAL_LIMITS__
+#ifndef ETL_INTEGRAL_LIMITS_INCLUDED
+#define ETL_INTEGRAL_LIMITS_INCLUDED
 
 #include <limits.h>
 #include <stddef.h>

include/etl/intrusive_forward_list.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_INTRUSIVE_FORWARD_LIST__
-#define __ETL_INTRUSIVE_FORWARD_LIST__
+#ifndef ETL_INTRUSIVE_FORWARD_LIST_INCLUDED
+#define ETL_INTRUSIVE_FORWARD_LIST_INCLUDED
 
 #include "platform.h"
 

include/etl/intrusive_links.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_INTRUSIVE_LINKS__
-#define __ETL_INTRUSIVE_LINKS__
+#ifndef ETL_INTRUSIVE_LINKS_INCLUDED
+#define ETL_INTRUSIVE_LINKS_INCLUDED
 
 #include <assert.h>
 #include <utility>

include/etl/intrusive_list.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_INTRUSIVE_LIST__
-#define __ETL_INTRUSIVE_LIST__
+#ifndef ETL_INTRUSIVE_LIST_INCLUDED
+#define ETL_INTRUSIVE_LIST_INCLUDED
 
 #include "platform.h"
 

include/etl/intrusive_queue.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_INTRUSIVE_QUEUE__
-#define __ETL_INTRUSIVE_QUEUE__
+#ifndef ETL_INTRUSIVE_QUEUE_INCLUDED
+#define ETL_INTRUSIVE_QUEUE_INCLUDED
 
 #include <stddef.h>
 

include/etl/intrusive_stack.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_INTRUSIVE_STACK__
-#define __ETL_INTRUSIVE_STACK__
+#ifndef ETL_INTRUSIVE_STACK_INCLUDED
+#define ETL_INTRUSIVE_STACK_INCLUDED
 
 #include <stddef.h>
 

include/etl/io_port.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_IO_PORT__
-#define __ETL_IO_PORT__
+#ifndef ETL_IO_PORT_INCLUDED
+#define ETL_IO_PORT_INCLUDED
 
 ///\defgroup io_port io port
 /// IO port access

include/etl/iterator.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ITERATOR__
-#define __ETL_ITERATOR__
+#ifndef ETL_ITERATOR_INCLUDED
+#define ETL_ITERATOR_INCLUDED
 
 #include <iterator>
 

include/etl/jenkins.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_JENKINS__
-#define __ETL_JENKINS__
+#ifndef ETL_JENKINS_INCLUDED
+#define ETL_JENKINS_INCLUDED
 
 #include <stdint.h>
 #include <iterator>

include/etl/largest.h

@@ -50,8 +50,8 @@ SOFTWARE.
 // See generate.bat
 //***************************************************************************
 
-#ifndef __ETL_LARGEST__
-#define __ETL_LARGEST__
+#ifndef ETL_LARGEST_INCLUDED
+#define ETL_LARGEST_INCLUDED
 
 ///\defgroup largest largest
 ///\ingroup utilities

include/etl/largest_generator.h

@@ -62,8 +62,8 @@ cog.outl("//********************************************************************
 // See generate.bat
 //***************************************************************************
 
-#ifndef __ETL_LARGEST__
-#define __ETL_LARGEST__
+#ifndef ETL_LARGEST_INCLUDED
+#define ETL_LARGEST_INCLUDED
 
 ///\defgroup largest largest
 ///\ingroup utilities

include/etl/list.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_LIST__
-#define __ETL_LIST__
+#ifndef ETL_LIST_INCLUDED
+#define ETL_LIST_INCLUDED
 
 #include <iterator>
 #include <algorithm>

include/etl/log.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_LOG__
-#define __ETL_LOG__
+#ifndef ETL_LOG_INCLUDED
+#define ETL_LOG_INCLUDED
 
 #include <stddef.h>
 

include/etl/map.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_MAP__
-#define __ETL_MAP__
+#ifndef ETL_MAP_INCLUDED
+#define ETL_MAP_INCLUDED
 
 #include <stddef.h>
 #include <iterator>
@@ -342,7 +342,7 @@ namespace etl
     //*************************************************************************
     void rotate_3node(Node*& position, uint_least8_t dir, uint_least8_t third)
     {
-      //        __A__             __E__            __A__             __D__
+      //        --A--             --E--            --A--             --D--
       //      _B_    C    ->     B     A    OR    B    _C_   ->     A     C
       //     D   E              D F   G C             D   E        B F   G E
       //        F G                                  F G

include/etl/memory.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_MEMORY__
-#define __ETL_MEMORY__
+#ifndef ETL_MEMORY_INCLUDED
+#define ETL_MEMORY_INCLUDED
 
 #include <iterator>
 #include <algorithm>

include/etl/message.h

@@ -26,8 +26,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_MESSAGE__
-#define __ETL_MESSAGE__
+#ifndef ETL_MESSAGE_INCLUDED
+#define ETL_MESSAGE_INCLUDED
 
 #include <stdint.h>
 

include/etl/message_bus.h

@@ -26,8 +26,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_MESSAGE_BUS_
-#define __ETL_MESSAGE_BUS_
+#ifndef ETL_MESSAGE_BUS_
+#define ETL_MESSAGE_BUS_
 
 #include <stdint.h>
 #include <algorithm>

include/etl/message_router.h

@@ -48,8 +48,8 @@ SOFTWARE.
 // See generate.bat
 //***************************************************************************
 
-#ifndef __ETL_MESSAGE_ROUTER__
-#define __ETL_MESSAGE_ROUTER__
+#ifndef ETL_MESSAGE_ROUTER_INCLUDED
+#define ETL_MESSAGE_ROUTER_INCLUDED
 
 #include <stdint.h>
 

include/etl/message_router_generator.h

@@ -60,8 +60,8 @@ cog.outl("//********************************************************************
 // See generate.bat
 //***************************************************************************
 
-#ifndef __ETL_MESSAGE_ROUTER__
-#define __ETL_MESSAGE_ROUTER__
+#ifndef ETL_MESSAGE_ROUTER_INCLUDED
+#define ETL_MESSAGE_ROUTER_INCLUDED
 
 #include <stdint.h>
 

include/etl/message_timer.h

@@ -26,8 +26,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_MESSAGE_TIMER__
-#define __ETL_MESSAGE_TIMER__
+#ifndef ETL_MESSAGE_TIMER_INCLUDED
+#define ETL_MESSAGE_TIMER_INCLUDED
 
 #include <stdint.h>
 #include <algorithm>
@@ -148,7 +148,7 @@ namespace etl
     message_timer_data& operator =(const message_timer_data& other);
   };
 
-  namespace __private_message_timer__
+  namespace private_message_timer
   {
     //*************************************************************************
     /// A specialised intrusive linked list for timer data.
@@ -623,7 +623,7 @@ namespace etl
     message_timer_data* const timer_array;
 
     // The list of active timers.
-    __private_message_timer__::list active_list;
+    private_message_timer::list active_list;
 
     volatile bool enabled;
     

include/etl/message_types.h

@@ -26,8 +26,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_MESSAGE_DEFS__
-#define __ETL_MESSAGE_DEFS__
+#ifndef ETL_MESSAGE_DEFS_INCLUDED
+#define ETL_MESSAGE_DEFS_INCLUDED
 
 #include <stdint.h>
 

include/etl/multimap.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_MULTIMAP__
-#define __ETL_MULTIMAP__
+#ifndef ETL_MULTIMAP_INCLUDED
+#define ETL_MULTIMAP_INCLUDED
 
 #include <stddef.h>
 #include <iterator>
@@ -347,7 +347,7 @@ namespace etl
     //*************************************************************************
     void rotate_3node(Node*& position, uint_least8_t dir, uint_least8_t third)
     {
-      //        __A__             __E__            __A__             __D__
+      //        --A--             --E--            --A--             --D--
       //      _B_    C    ->     B     A    OR    B    _C_   ->     A     C
       //     D   E              D F   G C             D   E        B F   G E
       //        F G                                  F G

include/etl/multiset.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_MULTISET__
-#define __ETL_MULTISET__
+#ifndef ETL_MULTISET_INCLUDED
+#define ETL_MULTISET_INCLUDED
 
 #include <stddef.h>
 #include <iterator>
@@ -555,7 +555,7 @@ namespace etl
     //*************************************************************************
     void rotate_3node(Node*& position, uint_least8_t dir, uint_least8_t third)
     {
-      //        __A__             __E__            __A__             __D__
+      //        --A--             --E--            --A--             --D--
       //      _B_    C    ->     B     A    OR    B    _C_   ->     A     C
       //     D   E              D F   G C             D   E        B F   G E
       //        F G                                  F G

include/etl/murmur3.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_MURMUR3__
-#define __ETL_MURMUR3__
+#ifndef ETL_MURMUR3_INCLUDED
+#define ETL_MURMUR3_INCLUDED
 
 #include <stdint.h>
 

include/etl/mutex.h

@@ -26,8 +26,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_MUTEX__
-#define __ETL_MUTEX__
+#ifndef ETL_MUTEX_INCLUDED
+#define ETL_MUTEX_INCLUDED
 
 #include "platform.h"
 

include/etl/mutex/mutex_arm.h

@@ -26,8 +26,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_MUTEX_ARM__
-#define __ETL_MUTEX_ARM__
+#ifndef ETL_MUTEX_ARM_INCLUDED
+#define ETL_MUTEX_ARM_INCLUDED
 
 #include "mutex_gcc_sync.h"
 

include/etl/mutex/mutex_gcc_sync.h

@@ -26,8 +26,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_MUTEX_GCC_SYNC__
-#define __ETL_MUTEX_GCC_SYNC__
+#ifndef ETL_MUTEX_GCC_SYNC_INCLUDED
+#define ETL_MUTEX_GCC_SYNC_INCLUDED
 
 #include "../platform.h"
 

include/etl/mutex/mutex_std.h

@@ -26,8 +26,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_MUTEX_STD__
-#define __ETL_MUTEX_STD__
+#ifndef ETL_MUTEX_STD_INCLUDED
+#define ETL_MUTEX_STD_INCLUDED
 
 #include "../platform.h"
 

include/etl/nullptr.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_NULLPTR__
-#define __ETL_NULLPTR__
+#ifndef ETL_NULLPTR_INCLUDED
+#define ETL_NULLPTR_INCLUDED
 
 #include "platform.h"
 

include/etl/numeric.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_NUMERIC__
-#define __ETL_NUMERIC__
+#ifndef ETL_NUMERIC_INCLUDED
+#define ETL_NUMERIC_INCLUDED
 
 #include "platform.h"
 

include/etl/observer.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_OBSERVER__
-#define __ETL_OBSERVER__
+#ifndef ETL_OBSERVER_INCLUDED
+#define ETL_OBSERVER_INCLUDED
 
 //*****************************************************************************
 ///\defgroup observer observer

include/etl/optional.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_OPTIONAL__
-#define __ETL_OPTIONAL__
+#ifndef ETL_OPTIONAL_INCLUDED
+#define ETL_OPTIONAL_INCLUDED
 
 #include "platform.h"
 #include "alignment.h"

include/etl/packet.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_PACKET__
-#define __ETL_PACKET__
+#ifndef ETL_PACKET_INCLUDED
+#define ETL_PACKET_INCLUDED
 
 #include "platform.h"
 #include "static_assert.h"

include/etl/parameter_type.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_PARAMETER__
-#define __ETL_PARAMETER__
+#ifndef ETL_PARAMETER_INCLUDED
+#define ETL_PARAMETER_INCLUDED
 
 #include "platform.h"
 #include "type_traits.h"

include/etl/pearson.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_PEARSON__
-#define __ETL_PEARSON__
+#ifndef ETL_PEARSON_INCLUDED
+#define ETL_PEARSON_INCLUDED
 
 #include <stdint.h>
 

include/etl/permutations.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_PERMUTATIONS__
-#define __ETL_PERMUTATIONS__
+#ifndef ETL_PERMUTATIONS_INCLUDED
+#define ETL_PERMUTATIONS_INCLUDED
 
 #include "platform.h"
 

include/etl/platform.h

@@ -30,8 +30,8 @@ SOFTWARE.
 
 #include <stdint.h>
 
-#ifndef __ETL_PLATFORM__
-#define __ETL_PLATFORM__
+#ifndef ETL_PLATFORM_INCLUDED
+#define ETL_PLATFORM_INCLUDED
 
 // Some targets do not support 8bit types.
 #define ETL_8BIT_SUPPORT (CHAR_BIT == 8)

include/etl/pool.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_POOL__
-#define __ETL_POOL__
+#ifndef ETL_POOL_INCLUDED
+#define ETL_POOL_INCLUDED
 
 #include "platform.h"
 #include "error_handler.h"

include/etl/power.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_POW__
-#define __ETL_POW__
+#ifndef ETL_POW_INCLUDED
+#define ETL_POW_INCLUDED
 
 #include <stddef.h>
 #include <stdint.h>

include/etl/priority_queue.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_PRIORITY_QUEUE__
-#define __ETL_PRIORITY_QUEUE__
+#ifndef ETL_PRIORITY_QUEUE_INCLUDED
+#define ETL_PRIORITY_QUEUE_INCLUDED
 
 #include <stddef.h>
 #include <functional>

include/etl/private/ivectorpointer.h

@@ -28,10 +28,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_IVECTOR_POINTER__
-#define __ETL_IVECTOR_POINTER__
+#ifndef ETL_IVECTOR_POINTER_INCLUDED
+#define ETL_IVECTOR_POINTER_INCLUDED
 
-#ifndef __ETL_IN_VECTOR_H__
+#ifndef ETL_IN_VECTOR_H
 #error  This header is a private element of etl::ivector
 #endif
 

include/etl/private/pvoidvector.h

@@ -28,10 +28,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_PVOIDVECTOR__
-#define __ETL_PVOIDVECTOR__
+#ifndef ETL_PVOIDVECTOR_INCLUDED
+#define ETL_PVOIDVECTOR_INCLUDED
 
-#define __ETL_IN_PVOIDVECTOR__
+#define ETL_IN_PVOIDVECTOR
 
 #include <iterator>
 #include <algorithm>
@@ -598,6 +598,6 @@ namespace etl
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 #endif
 
-#undef __ETL_IN_PVOIDVECTOR__
+#undef ETL_IN_PVOIDVECTOR
 
 #endif

include/etl/private/vector_base.h

@@ -28,12 +28,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#if !defined(__ETL_IN_VECTOR_H__) && !defined(__ETL_IN_PVOIDVECTOR__)
+#if !defined(ETL_IN_VECTOR_H) && !defined(ETL_IN_PVOIDVECTOR)
 #error This header is a private element of etl::vector & etl::pvoidvector
 #endif
 
-#ifndef __ETL_VECTOR_BASE__
-#define __ETL_VECTOR_BASE__
+#ifndef ETL_VECTOR_BASE_INCLUDED
+#define ETL_VECTOR_BASE_INCLUDED
 
 #include <stddef.h>
 

include/etl/profiles/arduino_arm.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ARDUINO__
-#define __ETL_ARDUINO__
+#ifndef ETL_ARDUINO_INCLUDED
+#define ETL_ARDUINO_INCLUDED
 
 //*****************************************************************************
 // Arduino

include/etl/profiles/armv5.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ARMV5__
-#define __ETL_ARMV5__
+#ifndef ETL_ARMV5_INCLUDED
+#define ETL_ARMV5_INCLUDED
 
 //*****************************************************************************
 // ARM Compiler Version 5

include/etl/profiles/armv6.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_ARMV6__
-#define __ETL_ARMV6__
+#ifndef ETL_ARMV6_INCLUDED
+#define ETL_ARMV6_INCLUDED
 
 //*****************************************************************************
 // ARM Compiler Version 6

include/etl/profiles/cpp03.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_CPP03__
-#define __ETL_CPP03__
+#ifndef ETL_CPP03_INCLUDED
+#define ETL_CPP03_INCLUDED
 
 //*****************************************************************************
 // Generic C++03

include/etl/profiles/cpp11.h

@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#ifndef __ETL_CPP11__
-#define __ETL_CPP11__
+#ifndef ETL_CPP11_INCLUDED
+#define ETL_CPP11_INCLUDED
 
 //*****************************************************************************
 // Generic C++11