From 46a1fc76159df9e19ead8bac6299fafceab65a13 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Tue, 7 Jan 2014 17:43:18 +0000 Subject: [PATCH] Removed unnecessary union name --- include/internal/catch_tostring.hpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/include/internal/catch_tostring.hpp b/include/internal/catch_tostring.hpp index b463e4ff..c081e944 100644 --- a/include/internal/catch_tostring.hpp +++ b/include/internal/catch_tostring.hpp @@ -83,17 +83,16 @@ namespace Detail { // Does not consider endian-ness template std::string rawMemoryToString( T value ) { - union - { - T value; + union { + T typedValue; unsigned char bytes[sizeof(T)]; - } valueAsBuffer; + }; - valueAsBuffer.value = value; + typedValue = value; std::ostringstream oss; oss << "0x"; - for( unsigned char* cp = valueAsBuffer.bytes; cp < valueAsBuffer.bytes+sizeof(T); ++cp ) + for( unsigned char* cp = bytes; cp < bytes+sizeof(T); ++cp ) oss << std::hex << std::setw(2) << std::setfill('0') << (unsigned int)*cp; return oss.str(); }