Field padding improved

plerup · Jan 30, 2021 · 7326874 · 7326874
1 parent 36e0d45
commit 7326874
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
     "name": "EspSoftwareSerial",
-    "version": "6.11.3",
+    "version": "6.11.4",
     "keywords": [
       "serial", "io", "softwareserial"
     ],

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=EspSoftwareSerial
-version=6.11.3
+version=6.11.4
 author=Dirk Kaar, Peter Lerup
 maintainer=Dirk Kaar <dok@dok-net.net>
 sentence=Implementation of the Arduino software serial for ESP8266/ESP32.

diff --git a/src/circular_queue/Delegate.h b/src/circular_queue/Delegate.h
@@ -341,7 +341,6 @@ namespace delegate
             }
 
         protected:
-            enum { FUNC, FP, FPA } kind;
             union {
                 FunctionType functional;
                 FunPtr fn;
@@ -350,6 +349,7 @@ namespace delegate
                     A obj;
                 };
             };
+            enum { FUNC, FP, FPA } kind;
         };
 #else
         template<typename A, typename R, typename... P>
@@ -551,12 +551,12 @@ namespace delegate
             }
 
         protected:
-            enum { FP, FPA } kind;
             union {
                 FunPtr fn;
                 FunAPtr fnA;
             };
             A obj;
+            enum { FP, FPA } kind;
         };
 #endif
 
@@ -758,11 +758,11 @@ namespace delegate
             }
 
         protected:
-            enum { FUNC, FP } kind;
             union {
                 FunctionType functional;
                 FunPtr fn;
             };
+            enum { FUNC, FP } kind;
         };
 #else
         template<typename R, typename... P>
@@ -1141,7 +1141,6 @@ namespace delegate
             }
 
         protected:
-            enum { FUNC, FP, FPA } kind;
             union {
                 FunctionType functional;
                 FunPtr fn;
@@ -1150,6 +1149,7 @@ namespace delegate
                     A obj;
                 };
             };
+            enum { FUNC, FP, FPA } kind;
         };
 #else
         template<typename A, typename R>
@@ -1350,12 +1350,12 @@ namespace delegate
             }
 
         protected:
-            enum { FP, FPA } kind;
             union {
                 FunPtr fn;
                 FunAPtr fnA;
             };
             A obj;
+            enum { FP, FPA } kind;
         };
 #endif
 
@@ -1557,11 +1557,11 @@ namespace delegate
             }
 
         protected:
-            enum { FUNC, FP } kind;
             union {
                 FunctionType functional;
                 FunPtr fn;
             };
+            enum { FUNC, FP } kind;
         };
 #else
         template<typename R>