diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-13 10:40:13 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-13 11:25:01 +0200 |
| commit | 9125c08f3468928eba004636bd95494a94e1a82b (patch) | |
| tree | 6355de7f0bac3e37d9c48fd4b310bf7bccd71ea7 /src/chainparams.h | |
| parent | c2fa08461118979c76edb076a2fb15cd9c432821 (diff) | |
| parent | fd311996e877d567a4e34a19b47e94d66e07100a (diff) | |
| download | bitcoin-9125c08f3468928eba004636bd95494a94e1a82b.tar.xz | |
Merge pull request #6000
fd31199 consensus: don't use arith_uint256 in consensus.h (Cory Fields)
Diffstat (limited to 'src/chainparams.h')
| -rw-r--r-- | src/chainparams.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/chainparams.h b/src/chainparams.h index d0613beb45..e5e691cc53 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -6,7 +6,6 @@ #ifndef BITCOIN_CHAINPARAMS_H #define BITCOIN_CHAINPARAMS_H -#include "arith_uint256.h" #include "chainparamsbase.h" #include "checkpoints.h" #include "consensus/params.h" @@ -45,7 +44,7 @@ public: const CMessageHeader::MessageStartChars& MessageStart() const { return pchMessageStart; } const std::vector<unsigned char>& AlertKey() const { return vAlertPubKey; } int GetDefaultPort() const { return nDefaultPort; } - const arith_uint256& ProofOfWorkLimit() const { return consensus.powLimit; } + const uint256& ProofOfWorkLimit() const { return consensus.powLimit; } int SubsidyHalvingInterval() const { return consensus.nSubsidyHalvingInterval; } int EnforceBlockUpgradeMajority() const { return consensus.nMajorityEnforceBlockUpgrade; } int RejectBlockOutdatedMajority() const { return consensus.nMajorityRejectBlockOutdated; } |