From 621068260d22b571268439f71ede0526cf61a89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Blanchon?= <benoit.blanchon@gmail.com>
Date: Wed, 2 Jul 2014 12:51:27 +0200
Subject: [PATCH] Renamed union members

---
 JsonGenerator/JsonValue.cpp | 10 +++++-----
 JsonGenerator/JsonValue.h   | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/JsonGenerator/JsonValue.cpp b/JsonGenerator/JsonValue.cpp
index 24589d18..b44d2631 100644
--- a/JsonGenerator/JsonValue.cpp
+++ b/JsonGenerator/JsonValue.cpp
@@ -9,29 +9,29 @@
 
 size_t JsonValue::printBooleanTo(Print& p) const
 {
-    return p.write(content.boolean ? "true" : "false");
+    return p.write(content.asBool ? "true" : "false");
 }
 
 size_t JsonValue::printNumberTo(Print& p) const
 {
     char tmp[16];
 
-    sprintf(tmp, "%lg", content.number);
+    sprintf(tmp, "%lg", content.asDouble);
 
     return p.write(tmp);
 }
 
 size_t JsonValue::printObjectTo(Print& p) const
 {
-    if (content.object)
-        return ((Printable*) content.object)->printTo(p);
+    if (content.asPrintable)
+        return ((Printable*) content.asPrintable)->printTo(p);
     else
         return p.write("null");
 }
 
 size_t JsonValue::printStringTo(Print& p) const
 {
-    const char* s = content.string;
+    const char* s = content.asString;
 
     if (!s)
     {
diff --git a/JsonGenerator/JsonValue.h b/JsonGenerator/JsonValue.h
index 45dff0b8..a9d5a546 100644
--- a/JsonGenerator/JsonValue.h
+++ b/JsonGenerator/JsonValue.h
@@ -19,25 +19,25 @@ public:
     JsonValue(const char* value)
         : implementation(&JsonValue::printStringTo)
     {
-        content.string = value;
+        content.asString = value;
     }
 
     JsonValue(double value)
         : implementation(&JsonValue::printNumberTo)
     {
-        content.number = value;
+        content.asDouble = value;
     }
 
     JsonValue(bool value)
         : implementation(&JsonValue::printBooleanTo)
     {
-        content.boolean = value;
+        content.asBool = value;
     }
 
     JsonValue(Printable& value)
         : implementation(&JsonValue::printObjectTo)
     {
-        content.object = &value;
+        content.asPrintable = &value;
     }
 
     virtual size_t printTo(Print& p) const
@@ -50,10 +50,10 @@ private:
     
     union Content
     {
-        bool        boolean;
-        double      number;
-        Printable*  object;
-        const char* string;
+        bool        asBool;
+        double      asDouble;
+        Printable*  asPrintable;
+        const char* asString;
     };
 
     Content content;