diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-07-26 18:26:23 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-07-26 18:26:25 -0400 |
| commit | 89a116dc0b446de0d18a981699a279eeaf6c9ea9 (patch) | |
| tree | 121f36902c3046abd35365e9cf1709334d74a0c5 | |
| parent | f58674a20a127f104409e11c5c11591533ddf360 (diff) | |
| parent | aecd615ad7b78b953e91feb4d6fee696cad8e53c (diff) | |
| download | bitcoin-89a116dc0b446de0d18a981699a279eeaf6c9ea9.tar.xz | |
Merge #13773: wallet: Fix accidental use of the comma operator
aecd615ad7 wallet: Fix accidental use of the comma operator (practicalswift)
Pull request description:
Fix accidental use of the comma operator.
Tree-SHA512: 035bf497343996c67a2fe25f367d1a416811b518cb9c7a18ce92355627871614e40db699e869881f941bc51e47fb94022f5ae13e7f01462ef35249b2dd3647a0
| -rw-r--r-- | src/interfaces/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp index 28081c7c2c..55a6f771e5 100644 --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -90,7 +90,7 @@ WalletTxStatus MakeWalletTxStatus(const CWalletTx& wtx) WalletTxStatus result; auto mi = ::mapBlockIndex.find(wtx.hashBlock); CBlockIndex* block = mi != ::mapBlockIndex.end() ? mi->second : nullptr; - result.block_height = (block ? block->nHeight : std::numeric_limits<int>::max()), + result.block_height = (block ? block->nHeight : std::numeric_limits<int>::max()); result.blocks_to_maturity = wtx.GetBlocksToMaturity(); result.depth_in_main_chain = wtx.GetDepthInMainChain(); result.time_received = wtx.nTimeReceived; |