Merge remote-tracking branch 'upstream/develop' into develop

2 files changed, 3 insertions, 1 deletions

diff --git a/TestHelper.cpp b/TestHelper.cpp
index 20c42a9b..03e67934 100644
--- a/TestHelper.cpp
+++ b/TestHelper.cpp
@@ -42,6 +42,8 @@ void mine(Client& c, int numBlocks)
 
 void connectClients(Client& c1, Client& c2)
 {
+	(void)c1;
+	(void)c2;
 	// TODO: Move to WebThree. eth::Client no longer handles networking.
 #if 0
 	short c1Port = 20000;
diff --git a/rlp.cpp b/rlp.cpp
index b51f3a22..c3f9dda2 100644
--- a/rlp.cpp
+++ b/rlp.cpp
@@ -22,12 +22,12 @@
 
 #include <fstream>
 #include <sstream>
-#include "JsonSpiritHeaders.h"
 #include <libdevcore/Log.h>
 #include <libdevcore/RLP.h>
 #include <libdevcore/Common.h>
 #include <boost/test/unit_test.hpp>
 #include <algorithm>
+#include "JsonSpiritHeaders.h"
 
 using namespace std;
 using namespace dev;