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.

4 files changed, 4 insertions, 8 deletions

diff --git a/hexPrefix.cpp b/hexPrefix.cpp
index 62f4d491..0db8e75e 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 f82af521..f6c24442 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 9d2bb376..5e3cfcb6 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 03893525..7e744bec 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;