Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Unanonymised unions to avoid breaking on compilers that don’t support them

- e.g. GCC 4.3 and 4.4
- fixes #281
Commit
ad4489043b1d45476e0bdcfc046f4b8b15e1cbce
Author
Phil Nash ·
Parents
4e044ed4b17e

Files · Download .tar.gz

Changes

 include/internal/catch_tostring.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/internal/catch_tostring.h b/include/internal/catch_tostring.h
index d6c2fcf2..25faa2a3 100644
--- a/include/internal/catch_tostring.h
+++ b/include/internal/catch_tostring.h
@@ -84,25 +84,25 @@ namespace Detail {
         enum Arch { Big, Little };
 
         static Arch which() {
-            union {
+            union _{
                 int asInt;
                 char asChar[sizeof (int)];
-            };
+            } u;
 
-            asInt = 1;
-            return ( asChar[sizeof(int)-1] == 1 ) ? Big : Little;
+            u.asInt = 1;
+            return ( u.asChar[sizeof(int)-1] == 1 ) ? Big : Little;
         }
     };
 
     // Writes the raw memory into a string, considering endianness
     template<typename T>
     std::string rawMemoryToString( T value ) {
-        union {
+        union _ {
             T typedValue;
             unsigned char bytes[sizeof(T)];
-        };
+        } u;
 
-        typedValue = value;
+        u.typedValue = value;
 
         std::ostringstream oss;
         oss << "0x";
@@ -113,7 +113,7 @@ namespace Detail {
             end = inc = -1;
         }
         for( ; i != end; i += inc )
-            oss << std::hex << std::setw(2) << std::setfill('0') << (unsigned int)bytes[i];
+            oss << std::hex << std::setw(2) << std::setfill('0') << (unsigned int)u.bytes[i];
         return oss.str();
     }