From a33a70b5e1365274413c0feca5bab7c47d9a74ae Mon Sep 17 00:00:00 2001
From: Rolan Reznik <rolan-reznik@users.noreply.github.com>
Date: Fri, 28 Aug 2020 17:12:47 +0300
Subject: [PATCH] ARM5 (armcc) compiler fixes for C++11. (#261)

---
 include/etl/alignment.h   | 2 +-
 include/etl/type_traits.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/etl/alignment.h b/include/etl/alignment.h
index a24bf23b..f7a258f2 100644
--- a/include/etl/alignment.h
+++ b/include/etl/alignment.h
@@ -184,7 +184,7 @@ namespace etl
         return reinterpret_cast<const T*>(data);
       }
 
-#if ETL_CPP11_SUPPORTED
+#if ETL_CPP11_SUPPORTED && !defined(ETL_COMPILER_ARM5)
       alignas(ALIGNMENT) char data[LENGTH];
 #else
       union
diff --git a/include/etl/type_traits.h b/include/etl/type_traits.h
index 23728d8b..3757f6b7 100644
--- a/include/etl/type_traits.h
+++ b/include/etl/type_traits.h
@@ -751,7 +751,7 @@ namespace etl
   //***************************************************************************
   /// Alignment templates.
   /// These require compiler specific intrinsics.
-#if ETL_CPP11_SUPPORTED
+#if ETL_CPP11_SUPPORTED && !defined(ETL_COMPILER_ARM5)
   template <typename T> struct alignment_of : integral_constant<size_t, alignof(T)> { };
 #elif ETL_COMPILER_MICROSOFT
   template <typename T> struct alignment_of : integral_constant<size_t, size_t(__alignof(T))> {};