diff options
| author | Wladimir J. van der Laan <[email protected]> | 2017-09-07 21:07:03 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2017-09-07 21:09:00 +0200 |
| commit | 2f0d3e604aa934d71bfc88e69fa8e03a571042a3 (patch) | |
| tree | 2abd315f968e318f44d1edd489a0be47a3825ed8 /src | |
| parent | Merge #11237: qt: Fixing division by zero in time remaining (diff) | |
| parent | Ensure that data types are consistent (diff) | |
| download | discoin-2f0d3e604aa934d71bfc88e69fa8e03a571042a3.tar.xz discoin-2f0d3e604aa934d71bfc88e69fa8e03a571042a3.zip | |
Merge #11232: Ensure that data types are consistent
061297f0a Ensure that data types are consistent (jjz)
Pull request description:
1. nStatus of CBlockIndex is consistent with the definition of Enum(BlockStatus)
2. The BlockHeader is consistent with the type of variable defined in CBlockHeader
Tree-SHA512: 3d4a55c62d3e17b9c83807eae153db4fcfcd8477c9413a45dedfa157563e77b775a66974648d28c9d44ac45a5705eef83b31a8a3b44316dc9814b85526a9d034
Diffstat (limited to 'src')
| -rw-r--r-- | src/chain.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/chain.h b/src/chain.h index ef7e6f955..f1036e5d9 100644 --- a/src/chain.h +++ b/src/chain.h @@ -204,14 +204,14 @@ public: unsigned int nChainTx; //! Verification status of this block. See enum BlockStatus - unsigned int nStatus; + uint32_t nStatus; //! block header - int nVersion; + int32_t nVersion; uint256 hashMerkleRoot; - unsigned int nTime; - unsigned int nBits; - unsigned int nNonce; + uint32_t nTime; + uint32_t nBits; + uint32_t nNonce; //! (memory only) Sequential id assigned to distinguish order in which blocks are received. int32_t nSequenceId; |