diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-21 14:29:12 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-11-21 14:33:22 +0100 |
| commit | f2ada138c28bf6b4f4a668c4ab60b55d124c9823 (patch) | |
| tree | a8266e2f901e69384ceef9b305d23944e713d599 /src/chain.h | |
| parent | ca6fb4e885c899e297e0a6fa723604a41f199aa6 (diff) | |
| parent | 092b58d13d658baebbf03a6d5209f368f19e50a8 (diff) | |
| download | bitcoin-f2ada138c28bf6b4f4a668c4ab60b55d124c9823.tar.xz | |
Merge pull request #5170
092b58d CBlockIndex::GetBlockWork() + GetProofIncrement(nBits) -> GetBlockProof(CBlockIndex) (jtimon)
22c4272 MOVEONLY: Move void UpdateTime() from pow.o to miner.o (plus fix include main.h -> chain.h) (jtimon)
Diffstat (limited to 'src/chain.h')
| -rw-r--r-- | src/chain.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/chain.h b/src/chain.h index f99fd113b7..c01240665d 100644 --- a/src/chain.h +++ b/src/chain.h @@ -220,11 +220,6 @@ public: return (int64_t)nTime; } - uint256 GetBlockWork() const - { - return GetProofIncrement(nBits); - } - enum { nMedianTimeSpan=11 }; int64_t GetMedianTimePast() const |