cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christoph Jentzsch 2014-10-01 13:59:36 +02:00
commit 8b3b711eff
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TestHelper.cpp
View File

@ -42,6 +42,8 @@ void mine(Client& c, int numBlocks)
void connectClients(Client& c1, Client& c2) void connectClients(Client& c1, Client& c2)
{ {
(void)c1;
(void)c2;
// TODO: Move to WebThree. eth::Client no longer handles networking. // TODO: Move to WebThree. eth::Client no longer handles networking.
#if 0 #if 0
short c1Port = 20000; short c1Port = 20000;

2
rlp.cpp
View File

@ -22,12 +22,12 @@
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include "JsonSpiritHeaders.h"
#include <libdevcore/Log.h> #include <libdevcore/Log.h>
#include <libdevcore/RLP.h> #include <libdevcore/RLP.h>
#include <libdevcore/Common.h> #include <libdevcore/Common.h>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <algorithm> #include <algorithm>
#include "JsonSpiritHeaders.h"
using namespace std; using namespace std;
using namespace dev; using namespace dev;