From c0923e1d6a7299b450df11f92a1118f937144658 Mon Sep 17 00:00:00 2001
From: John Wellbelove <jwellbelove@users.noreply.github.com>
Date: Fri, 24 Jun 2022 15:59:25 +0100
Subject: [PATCH] Fix to message_packet

Fix tests for atomic under GCC
---
 .github/workflows/clang.yml  |  2 +-
 .github/workflows/gcc.yml    |  2 +-
 .github/workflows/vs2019.yml |  2 +-
 include/etl/message_packet.h | 22 ++++++++++------------
 test/test_atomic.cpp         | 14 ++++++++------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
index 237ac4b6..2c9def9b 100644
--- a/.github/workflows/clang.yml
+++ b/.github/workflows/clang.yml
@@ -1,7 +1,7 @@
 name: clang
 on:
   push:
-    branches: [ master ]
+    branches: [ master, development ]
   pull_request:
     branches: [ master ]
 
diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
index b78021a1..2042fbeb 100644
--- a/.github/workflows/gcc.yml
+++ b/.github/workflows/gcc.yml
@@ -1,7 +1,7 @@
 name: gcc
 on:
   push:
-    branches: [ master ]
+    branches: [ master, development]
   pull_request:
     branches: [ master ]
 
diff --git a/.github/workflows/vs2019.yml b/.github/workflows/vs2019.yml
index 8e6f0501..002d67e4 100644
--- a/.github/workflows/vs2019.yml
+++ b/.github/workflows/vs2019.yml
@@ -1,7 +1,7 @@
 name: vs2019
 on:
   push:
-    branches: [ master ]
+    branches: [ master, development ]
   pull_request:
     branches: [ master ]
 
diff --git a/include/etl/message_packet.h b/include/etl/message_packet.h
index 1081cfe5..7788b929 100644
--- a/include/etl/message_packet.h
+++ b/include/etl/message_packet.h
@@ -69,14 +69,8 @@ namespace etl
   template <typename... TMessageTypes>
   class message_packet
   {
-  public:
 
-    //********************************************
-    message_packet()
-      : data()
-      , valid(false)
-    {
-    }
+  private:
 
     template <typename T>
     static constexpr bool IsMessagePacket = etl::is_same_v< etl::remove_const_t<etl::remove_reference_t<T>>, etl::message_packet<TMessageTypes...>>;
@@ -87,6 +81,15 @@ namespace etl
     template <typename T>
     static constexpr bool IsIMessage = etl::is_same_v<remove_const_t<etl::remove_reference_t<T>>, etl::imessage>;
 
+  public:
+
+    //********************************************
+    message_packet()
+      : data()
+      , valid(false)
+    {
+    }
+
     //********************************************
     /// 
     //********************************************
@@ -95,11 +98,6 @@ namespace etl
       : data()
       , valid(true)
     {
-      bool b1 = IsIMessage<T>;
-      bool b2 = IsInMessageList<T>;
-      bool b3 = IsMessagePacket<T>;
-      bool b4 = etl::is_rvalue_reference_v<T>;
-
       if constexpr (IsIMessage<T>)
       {
         if (accepts(msg))
diff --git a/test/test_atomic.cpp b/test/test_atomic.cpp
index ce1cffa1..801f3069 100644
--- a/test/test_atomic.cpp
+++ b/test/test_atomic.cpp
@@ -54,13 +54,15 @@ namespace
   {
     enum enum_type
     {
+      Zero = 0,
       One = 1,
       Two = 2
     };
  
     ETL_DECLARE_ENUM_TYPE(Enum, int)
-    ETL_ENUM_TYPE(One, "1")
-    ETL_ENUM_TYPE(Two, "2")
+    ETL_ENUM_TYPE(Zero, "0")
+    ETL_ENUM_TYPE(One,  "1")
+    ETL_ENUM_TYPE(Two,  "2")
     ETL_END_ENUM_TYPE
   };
 
@@ -547,8 +549,8 @@ namespace
     //*************************************************************************
     TEST(test_atomic_compare_exchange_weak_pass_for_enum)
     {
-      std::atomic<Enum> compare;
-      etl::atomic<Enum> test;
+      std::atomic<Enum> compare(Enum::Zero);
+      etl::atomic<Enum> test(Enum::Zero);
 
       Enum actual = Enum::One;
 
@@ -639,8 +641,8 @@ namespace
     //*************************************************************************
     TEST(test_atomic_compare_exchange_strong_pass_for_enum)
     {
-      std::atomic<Enum> compare;
-      etl::atomic<Enum> test;
+      std::atomic<Enum> compare(Enum::Zero);
+      etl::atomic<Enum> test(Enum::Zero);
 
       Enum actual = Enum::One;