Merge remote-tracking branch 'origin/development'

# Conflicts: # library.properties # support/Release notes.txt # test/codeblocks/ETL.layout
ETLCPP · Feb 26, 2018 · 1e2866a · 1e2866a
1 parent 9a92110
commit 1e2866a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Embedded Template Library
-version=10.21.0
+version=10.21.1
 author= John Wellbelove <[email protected]>
 maintainer=John Wellbelove <[email protected]>
 sentence=A C++ template library tailored for embedded systems.

diff --git a/src/variant.h b/src/variant.h
@@ -645,12 +645,20 @@ namespace etl
 
       TBase& operator()(uint_least8_t* p_data, uint_least8_t typeId)
       {
-        return reinterpret_cast<U1&>(*p_data);
+        switch (typeId)
+        {
+          case 0: return reinterpret_cast<U1&>(*p_data);
+          default: return reinterpret_cast<TBase&>(*reinterpret_cast<TBase*>(0));
+        }
       }
 
       const TBase& operator()(uint_least8_t* p_data, uint_least8_t typeId) const
       {
-        return reinterpret_cast<const U1&>(*p_data);
+        switch (typeId)
+        {
+          case 0: return reinterpret_cast<const U1&>(*p_data);
+          default: return reinterpret_cast<const TBase&>(*reinterpret_cast<const TBase*>(0));
+        }
       }
     };
 

diff --git a/support/Release notes.txt b/support/Release notes.txt
@@ -1,3 +1,7 @@
+===============================================================================
+10.21.1
+Removal of GCC warnings from variant.h.
+
 ===============================================================================
 10.21.0
 Completion of operator set for etl::optional