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)
2014-11-21 14:29:12 +01:00
parent ca6fb4e885 092b58d13d
commit f2ada138c2
6 changed files with 20 additions and 26 deletions
--- 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