aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-09-07 21:07:03 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2017-09-07 21:09:00 +0200
commit2f0d3e604aa934d71bfc88e69fa8e03a571042a3 (patch)
tree2abd315f968e318f44d1edd489a0be47a3825ed8
parente7f125562fbbfc18cd98b081de75090069078ec2 (diff)
parent061297f0ac5ddedf0e8457a5660e01a742b15d55 (diff)
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
-rw-r--r--src/chain.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/chain.h b/src/chain.h
index ef7e6f9554..f1036e5d92 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;