From 180841fa263306c408183d70c8bf764d5f8774ad Mon Sep 17 00:00:00 2001
From: Jochen Steinmann <30695613+Jogi7819@users.noreply.github.com>
Date: Mon, 7 Feb 2022 11:51:10 +0100
Subject: [PATCH] Put storage class first and remove unreachable statement
 (#505)

Fixes following greenhills compiler warnings
* etl/include/etl/message_router.h", line 2434 (col. 11): warning #111-D: statement is unreachable
* etl/include/etl/char_traits.h", line 105 (col. 19): warning #82-D: storage class is not first

Co-authored-by: Jochen Steinmann <jochen.steinmann2@de.bosch.com>
---
 include/etl/char_traits.h            |  6 +++---
 include/etl/endianness.h             |  2 +-
 include/etl/message_router.h         | 16 --------------
 include/etl/private/delegate_cpp11.h | 32 ++++++++++++++--------------
 4 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/include/etl/char_traits.h b/include/etl/char_traits.h
index cd236b3b..1774a3c3 100644
--- a/include/etl/char_traits.h
+++ b/include/etl/char_traits.h
@@ -102,19 +102,19 @@ namespace etl
     typedef typename char_traits_types<T>::state_type state_type;
 
     //*************************************************************************
-    ETL_CONSTEXPR static bool eq(char_type a, char_type b)
+    static ETL_CONSTEXPR bool eq(char_type a, char_type b)
     {
       return a == b;
     }
 
     //*************************************************************************
-    ETL_CONSTEXPR static bool lt(char_type a, char_type b)
+    static ETL_CONSTEXPR bool lt(char_type a, char_type b)
     {
       return a < b;
     }
 
     //*************************************************************************
-    ETL_CONSTEXPR14 static size_t length(const char_type* str)
+    static ETL_CONSTEXPR14 size_t length(const char_type* str)
     {
       size_t count = 0UL;
 
diff --git a/include/etl/endianness.h b/include/etl/endianness.h
index b53ca51d..300bc84d 100644
--- a/include/etl/endianness.h
+++ b/include/etl/endianness.h
@@ -132,7 +132,7 @@ namespace etl
   private:
 
 #if ETL_ENDIANNESS_IS_CONSTEXPR
-    ETL_CONSTEXPR static etl::endian get()
+    static ETL_CONSTEXPR etl::endian get()
     {
       return etl::endian::native;
     }
diff --git a/include/etl/message_router.h b/include/etl/message_router.h
index f182a2c5..897793e0 100644
--- a/include/etl/message_router.h
+++ b/include/etl/message_router.h
@@ -566,7 +566,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
@@ -701,7 +700,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
@@ -835,7 +833,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
@@ -968,7 +965,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
@@ -1098,7 +1094,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
@@ -1227,7 +1222,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
@@ -1355,7 +1349,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
@@ -1482,7 +1475,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
@@ -1606,7 +1598,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
@@ -1728,7 +1719,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
@@ -1849,7 +1839,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
@@ -1969,7 +1958,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
@@ -2086,7 +2074,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
@@ -2202,7 +2189,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
@@ -2317,7 +2303,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
@@ -2431,7 +2416,6 @@ namespace etl
           {
             return false;
           }
-          break;
         }
       }
     }
diff --git a/include/etl/private/delegate_cpp11.h b/include/etl/private/delegate_cpp11.h
index a3d30012..d1a6458e 100644
--- a/include/etl/private/delegate_cpp11.h
+++ b/include/etl/private/delegate_cpp11.h
@@ -121,7 +121,7 @@ namespace etl
     /// Create from function (Compile time).
     //*************************************************************************
     template <TReturn(*Method)(TParams...)>
-    ETL_CONSTEXPR14 static delegate create()
+    static ETL_CONSTEXPR14 delegate create()
     {
       return delegate(ETL_NULLPTR, function_stub<Method>);
     }
@@ -130,7 +130,7 @@ namespace etl
     /// Create from Lambda or Functor.
     //*************************************************************************
     template <typename TLambda, typename = etl::enable_if_t<etl::is_class<TLambda>::value, void>>
-    ETL_CONSTEXPR14 static delegate create(const TLambda& instance)
+    static ETL_CONSTEXPR14 delegate create(const TLambda& instance)
     {
       return delegate((void*)(&instance), lambda_stub<TLambda>);
     }
@@ -139,7 +139,7 @@ namespace etl
     /// Create from instance method (Run time).
     //*************************************************************************
     template <typename T, TReturn(T::*Method)(TParams...)>
-    ETL_CONSTEXPR14 static delegate create(T& instance)
+    static ETL_CONSTEXPR14 delegate create(T& instance)
     {
       return delegate((void*)(&instance), method_stub<T, Method>);
     }
@@ -149,13 +149,13 @@ namespace etl
     /// Deleted for rvalue references.
     //*************************************************************************
     template <typename T, TReturn(T::*Method)(TParams...)>
-    ETL_CONSTEXPR14 static delegate create(T&& instance) = delete;
+    static ETL_CONSTEXPR14 delegate create(T&& instance) = delete;
 
     //*************************************************************************
     /// Create from const instance method (Run time).
     //*************************************************************************
     template <typename T, TReturn(T::*Method)(TParams...) const>
-    ETL_CONSTEXPR14 static delegate create(const T& instance)
+    static ETL_CONSTEXPR14 delegate create(const T& instance)
     {
       return delegate((void*)(&instance), const_method_stub<T, Method>);
     }
@@ -164,13 +164,13 @@ namespace etl
     /// Disable create from rvalue instance method (Run time).
     //*************************************************************************
     template <typename T, TReturn(T::*Method)(TParams...) const>
-    ETL_CONSTEXPR14 static delegate create(T&& instance) = delete;
+    static ETL_CONSTEXPR14 delegate create(T&& instance) = delete;
 
     //*************************************************************************
     /// Create from instance method (Compile time).
     //*************************************************************************
     template <typename T, T& Instance, TReturn(T::*Method)(TParams...)>
-    ETL_CONSTEXPR14 static delegate create()
+    static ETL_CONSTEXPR14 delegate create()
     {
       return delegate(method_instance_stub<T, Instance, Method>);
     }
@@ -179,7 +179,7 @@ namespace etl
     /// Create from const instance method (Compile time).
     //*************************************************************************
     template <typename T, T const& Instance, TReturn(T::*Method)(TParams...) const>
-    ETL_CONSTEXPR14 static delegate create()
+    static ETL_CONSTEXPR14 delegate create()
     {
       return delegate(const_method_instance_stub<T, Instance, Method>);
     }
@@ -244,7 +244,7 @@ namespace etl
     /// At the time of writing, GCC appears to have trouble with this.
     //*************************************************************************
     template <typename T, T& Instance>
-    ETL_CONSTEXPR14 static delegate create()
+    static ETL_CONSTEXPR14 delegate create()
     {
       return delegate(operator_instance_stub<T, Instance>);
     }
@@ -444,7 +444,7 @@ namespace etl
     /// Stub call for a member function. Run time instance.
     //*************************************************************************
     template <typename T, TReturn(T::*Method)(TParams...)>
-    ETL_CONSTEXPR14 static TReturn method_stub(void* object, TParams... params)
+    static ETL_CONSTEXPR14 TReturn method_stub(void* object, TParams... params)
     {
       T* p = static_cast<T*>(object);
       return (p->*Method)(etl::forward<TParams>(params)...);
@@ -454,7 +454,7 @@ namespace etl
     /// Stub call for a const member function. Run time instance.
     //*************************************************************************
     template <typename T, TReturn(T::*Method)(TParams...) const>
-    ETL_CONSTEXPR14 static TReturn const_method_stub(void* object, TParams... params)
+    static ETL_CONSTEXPR14 TReturn const_method_stub(void* object, TParams... params)
     {
       T* const p = static_cast<T*>(object);
       return (p->*Method)(etl::forward<TParams>(params)...);
@@ -464,7 +464,7 @@ namespace etl
     /// Stub call for a member function. Compile time instance.
     //*************************************************************************
     template <typename T, T& Instance, TReturn(T::*Method)(TParams...)>
-    ETL_CONSTEXPR14 static TReturn method_instance_stub(void*, TParams... params)
+    static ETL_CONSTEXPR14 TReturn method_instance_stub(void*, TParams... params)
     {
       return (Instance.*Method)(etl::forward<TParams>(params)...);
     }
@@ -473,7 +473,7 @@ namespace etl
     /// Stub call for a const member function. Compile time instance.
     //*************************************************************************
     template <typename T, const T& Instance, TReturn(T::*Method)(TParams...) const>
-    ETL_CONSTEXPR14 static TReturn const_method_instance_stub(void*, TParams... params)
+    static ETL_CONSTEXPR14 TReturn const_method_instance_stub(void*, TParams... params)
     {
       return (Instance.*Method)(etl::forward<TParams>(params)...);
     }
@@ -483,7 +483,7 @@ namespace etl
     /// Stub call for a function operator. Compile time instance.
     //*************************************************************************
     template <typename T, T& Instance>
-    ETL_CONSTEXPR14 static TReturn operator_instance_stub(void*, TParams... params)
+    static ETL_CONSTEXPR14 TReturn operator_instance_stub(void*, TParams... params)
     {
       return Instance.operator()(etl::forward<TParams>(params)...);
     }
@@ -493,7 +493,7 @@ namespace etl
     /// Stub call for a free function.
     //*************************************************************************
     template <TReturn(*Method)(TParams...)>
-    ETL_CONSTEXPR14 static TReturn function_stub(void*, TParams... params)
+    static ETL_CONSTEXPR14 TReturn function_stub(void*, TParams... params)
     {
       return (Method)(etl::forward<TParams>(params)...);
     }
@@ -502,7 +502,7 @@ namespace etl
     /// Stub call for a lambda or functor function.
     //*************************************************************************
     template <typename TLambda>
-    ETL_CONSTEXPR14 static TReturn lambda_stub(void* object, TParams... arg)
+    static ETL_CONSTEXPR14 TReturn lambda_stub(void* object, TParams... arg)
     {
       TLambda* p = static_cast<TLambda*>(object);
       return (p->operator())(etl::forward<TParams>(arg)...);