From 19ee517d9f2a0f64d6874a6dfccbbc1b07b6e56b Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 24 Sep 2012 16:28:08 -0700
Subject: [PATCH] Neaten this up a bit.

---
 src/FieldNames.cpp     |  2 +-
 src/SerializeProto.h   | 30 ++++++++++++++++--------------
 src/SerializedObject.h |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/FieldNames.cpp b/src/FieldNames.cpp
index 3053c2c960..a65ce1bc93 100644
--- a/src/FieldNames.cpp
+++ b/src/FieldNames.cpp
@@ -2,7 +2,7 @@
 #include "FieldNames.h"
 
 #define FIELD(name, type, index) { sf##name, #name, STI_##type, index },
-#define TYPE(type, index)
+#define TYPE(name, type, index)
 
 FieldName FieldNames[]=
 {
diff --git a/src/SerializeProto.h b/src/SerializeProto.h
index fc02af1d12..d2336e8971 100644
--- a/src/SerializeProto.h
+++ b/src/SerializeProto.h
@@ -2,24 +2,26 @@
 // appropriate #define statements.
 
 	// types (common)
-	TYPE(UINT32,	1)
-	TYPE(UINT64,	2)
-	TYPE(HASH128,	3)
-	TYPE(HASH256,	4)
+	TYPE("Int32",			UINT32,		1)
+	TYPE("Int64",			UINT64,		2)
+	TYPE("Hash128",			HASH128,	3)
+	TYPE("Hash256",			HASH256,	4)
 	// 5 is reserved
-	TYPE(AMOUNT,	6)
-	TYPE(VL,		7)
-	TYPE(ACCOUNT,	8)
+	TYPE("Amount",			AMOUNT,		6)
+	TYPE("VariableLength",	VL,			7)
+	TYPE("Account",			ACCOUNT,	8)
 	// 9-13 are reserved
-	TYPE(OBJECT,	14)
-	TYPE(ARRAY,		15)
+	TYPE("Object",			OBJECT,		14)
+	TYPE("Array",			ARRAY,		15)
 
 	// types (uncommon)
-	TYPE(UINT8,		16)
-	TYPE(UINT16,	17)
-	TYPE(HASH160,	18)
-	TYPE(PATHSET,	19)
-	TYPE(VECTOR256,	20)
+	TYPE("Int8",			UINT8,		16)
+	TYPE("Int16",			UINT16,		17)
+	TYPE("Hash160",			HASH160,	18)
+	TYPE("PathSet",			PATHSET,	19)
+	TYPE("Vector256",		VECTOR256,	20)
+
+
 
 	// 8-bit integers
 	FIELD(CloseResolution,		UINT8, 1)
diff --git a/src/SerializedObject.h b/src/SerializedObject.h
index 89732a063d..3ff352a793 100644
--- a/src/SerializedObject.h
+++ b/src/SerializedObject.h
@@ -24,7 +24,7 @@ enum SOE_Field
 	sfGeneric = 0,
 
 #define FIELD(name, type, index) sf##name,
-#define TYPE(name, index)
+#define TYPE(name, type, index)
 #include "SerializeProto.h"
 #undef FIELD
 #undef TYPE