From 737218817997b9d20a2f8e99016310c906ffe504 Mon Sep 17 00:00:00 2001
From: Tim Hughes <tim@twistedfury.com>
Date: Wed, 5 Mar 2014 16:32:37 +0000
Subject: [PATCH] Fixed VS2013 projects and compile errors. Enable and fix
 addition warnings (-Wextra). Disable unknown pragma warning (avoids messy
 wrapping pragmas in compiler guards). Tidy up some of the waring suppression
 for 3rd part libraries by wrapping with a header.

---
 hexPrefix.cpp | 3 +--
 rlp.cpp       | 3 +--
 trie.cpp      | 3 +--
 vm.cpp        | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/hexPrefix.cpp b/hexPrefix.cpp
index 62f4d4916..0db8e75e9 100644
--- a/hexPrefix.cpp
+++ b/hexPrefix.cpp
@@ -21,8 +21,7 @@
  */
 
 #include <fstream>
-#include "../json_spirit/json_spirit_reader_template.h"
-#include "../json_spirit/json_spirit_writer_template.h"
+#include "JsonSpiritHeaders.h"
 #include "TrieCommon.h"
 #include "Log.h"
 using namespace std;
diff --git a/rlp.cpp b/rlp.cpp
index f82af521f..f6c244423 100644
--- a/rlp.cpp
+++ b/rlp.cpp
@@ -21,8 +21,7 @@
  */
 
 #include <fstream>
-#include "../json_spirit/json_spirit_reader_template.h"
-#include "../json_spirit/json_spirit_writer_template.h"
+#include "JsonSpiritHeaders.h"
 #include <Log.h>
 #include <RLP.h>
 using namespace std;
diff --git a/trie.cpp b/trie.cpp
index 9d2bb3763..5e3cfcb6c 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -21,9 +21,8 @@
  */
 
 #include <fstream>
-#include "../json_spirit/json_spirit_reader_template.h"
-#include "../json_spirit/json_spirit_writer_template.h"
 #include <random>
+#include "JsonSpiritHeaders.h"
 #include <TrieDB.h>
 #include "TrieHash.h"
 #include "MemTrie.h"
diff --git a/vm.cpp b/vm.cpp
index 03893525c..7e744becb 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -21,13 +21,12 @@
  */
 
 #include <fstream>
-#include "../json_spirit/json_spirit_reader_template.h"
-#include "../json_spirit/json_spirit_writer_template.h"
 #include <ExtVMFace.h>
 #include <Transaction.h>
 #include <VM.h>
 #include <Log.h>
 #include <Instruction.h>
+#include "JsonSpiritHeaders.h"
 using namespace std;
 using namespace json_spirit;
 using namespace eth;