Browse Source

Bump and build fix.

cl-refactor
Gav Wood 10 years ago
parent
commit
fea144622a
  1. 2
      libdevcore/Common.cpp
  2. 5
      libdevcrypto/FileSystem.cpp
  3. 1
      libethcore/Ethash.h
  4. 2
      libethcore/EthashAux.cpp

2
libdevcore/Common.cpp

@ -28,7 +28,7 @@ using namespace dev;
namespace dev namespace dev
{ {
char const* Version = "0.9.22"; char const* Version = "0.9.23";
const u256 UndefinedU256 = ~(u256)0; const u256 UndefinedU256 = ~(u256)0;

5
libdevcrypto/FileSystem.cpp

@ -70,11 +70,6 @@ std::string dev::getDataDir(std::string _prefix)
else else
dataDirPath = boost::filesystem::path(homeDir); dataDirPath = boost::filesystem::path(homeDir);
#if defined(__APPLE__) && defined(__MACH__)
// This eventually needs to be put in proper wrapper (to support sandboxing)
return (dataDirPath / "Library/Application Support/Ethereum").string();
#else
return (dataDirPath / ("." + _prefix)).string(); return (dataDirPath / ("." + _prefix)).string();
#endif #endif
#endif
} }

1
libethcore/Ethash.h

@ -79,7 +79,6 @@ public:
static WorkPackage package(BlockInfo const& _header); static WorkPackage package(BlockInfo const& _header);
static void assignResult(Solution const& _r, BlockInfo& _header) { _header.nonce = _r.nonce; _header.mixHash = _r.mixHash; } static void assignResult(Solution const& _r, BlockInfo& _header) { _header.nonce = _r.nonce; _header.mixHash = _r.mixHash; }
class CPUMiner: public Miner, Worker class CPUMiner: public Miner, Worker
{ {
public: public:

2
libethcore/EthashAux.cpp

@ -242,6 +242,6 @@ Ethash::Result EthashAux::eval(h256 const& _seedHash, h256 const& _headerHash, N
return dag->compute(_headerHash, _nonce); return dag->compute(_headerHash, _nonce);
DEV_IF_THROWS(return EthashAux::get()->light(_seedHash)->compute(_headerHash, _nonce)) DEV_IF_THROWS(return EthashAux::get()->light(_seedHash)->compute(_headerHash, _nonce))
{ {
return Ethash::Result(~h256(), h256()); return Ethash::Result{ ~h256(), h256() };
} }
} }

Loading…
Cancel
Save