Browse Source

Fixes some build issues.

cl-refactor
Gav Wood 10 years ago
parent
commit
2eab7a7c22
  1. 2
      libethereum/Client.cpp
  2. 8
      libweb3jsonrpc/WebThreeStubServerBase.cpp

2
libethereum/Client.cpp

@ -369,7 +369,7 @@ MineProgress Client::miningProgress() const
uint64_t Client::hashrate() const uint64_t Client::hashrate() const
{ {
uint64_t ret; uint64_t ret = 0;
ReadGuard l(x_localMiners); ReadGuard l(x_localMiners);
for (LocalMiner const& m: m_localMiners) for (LocalMiner const& m: m_localMiners)
ret += m.miningProgress().hashes / m.miningProgress().ms; ret += m.miningProgress().hashes / m.miningProgress().ms;

8
libweb3jsonrpc/WebThreeStubServerBase.cpp

@ -26,7 +26,7 @@
#include <jsonrpccpp/common/exception.h> #include <jsonrpccpp/common/exception.h>
#include <libdevcore/CommonData.h> #include <libdevcore/CommonData.h>
#if ETH_SOLIDITY #if ETH_SOLIDITY || !ETH_TRUE
#include <libsolidity/CompilerStack.h> #include <libsolidity/CompilerStack.h>
#include <libsolidity/Scanner.h> #include <libsolidity/Scanner.h>
#include <libsolidity/SourceReferenceFormatter.h> #include <libsolidity/SourceReferenceFormatter.h>
@ -38,7 +38,7 @@
#include <libethcore/CommonJS.h> #include <libethcore/CommonJS.h>
#include <libwhisper/Message.h> #include <libwhisper/Message.h>
#include <libwhisper/WhisperHost.h> #include <libwhisper/WhisperHost.h>
#if ETH_SERPENT #if ETH_SERPENT || !ETH_TRUE
#include <libserpent/funcs.h> #include <libserpent/funcs.h>
#endif #endif
#include "WebThreeStubServerBase.h" #include "WebThreeStubServerBase.h"
@ -632,7 +632,7 @@ string WebThreeStubServerBase::eth_compileSerpent(string const& _code)
// TODO throw here jsonrpc errors // TODO throw here jsonrpc errors
string res; string res;
(void)_code; (void)_code;
#if ETH_SERPENT || !TRUE #if ETH_SERPENT || !ETH_TRUE
try try
{ {
res = toJS(dev::asBytes(::compile(_code))); res = toJS(dev::asBytes(::compile(_code)));
@ -654,7 +654,7 @@ string WebThreeStubServerBase::eth_compileSolidity(string const& _code)
// TOOD throw here jsonrpc errors // TOOD throw here jsonrpc errors
(void)_code; (void)_code;
string res; string res;
#if ETH_SOLIDITY || !TRUE #if ETH_SOLIDITY || !ETH_TRUE
dev::solidity::CompilerStack compiler; dev::solidity::CompilerStack compiler;
try try
{ {

Loading…
Cancel
Save