diff options
| author | Jeremy Rubin <[email protected]> | 2019-08-08 16:18:30 -0700 |
|---|---|---|
| committer | Jeremy Rubin <[email protected]> | 2019-08-08 16:18:30 -0700 |
| commit | 2dbfb37b407ed23b517f507d78fb77334142dce5 (patch) | |
| tree | 26110d01d5ca6e2d1367c3040b5136736421beb5 /src | |
| parent | Merge #16554: test: only include and use OpenSSL where it's actually needed (... (diff) | |
| download | discoin-2dbfb37b407ed23b517f507d78fb77334142dce5.tar.xz discoin-2dbfb37b407ed23b517f507d78fb77334142dce5.zip | |
Fix Char as Bool in interfaces
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 3a45c1ccc..452f81bc4 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -444,7 +444,7 @@ public: * on this bitcoin node, and set to 0 for transactions that were created * externally and came in through the network or sendrawtransaction RPC. */ - char fFromMe; + bool fFromMe; int64_t nOrderPos; //!< position in ordered transaction list std::multimap<int64_t, CWalletTx*>::const_iterator m_it_wtxOrdered; @@ -501,8 +501,8 @@ public: std::vector<char> dummy_vector1; //!< Used to be vMerkleBranch std::vector<char> dummy_vector2; //!< Used to be vtxPrev - char dummy_char = false; //!< Used to be fSpent - s << tx << hashBlock << dummy_vector1 << nIndex << dummy_vector2 << mapValueCopy << vOrderForm << fTimeReceivedIsTxTime << nTimeReceived << fFromMe << dummy_char; + bool dummy_bool = false; //!< Used to be fSpent + s << tx << hashBlock << dummy_vector1 << nIndex << dummy_vector2 << mapValueCopy << vOrderForm << fTimeReceivedIsTxTime << nTimeReceived << fFromMe << dummy_bool; } template<typename Stream> @@ -512,8 +512,8 @@ public: std::vector<uint256> dummy_vector1; //!< Used to be vMerkleBranch std::vector<CMerkleTx> dummy_vector2; //!< Used to be vtxPrev - char dummy_char; //! Used to be fSpent - s >> tx >> hashBlock >> dummy_vector1 >> nIndex >> dummy_vector2 >> mapValue >> vOrderForm >> fTimeReceivedIsTxTime >> nTimeReceived >> fFromMe >> dummy_char; + bool dummy_bool; //! Used to be fSpent + s >> tx >> hashBlock >> dummy_vector1 >> nIndex >> dummy_vector2 >> mapValue >> vOrderForm >> fTimeReceivedIsTxTime >> nTimeReceived >> fFromMe >> dummy_bool; ReadOrderPos(nOrderPos, mapValue); nTimeSmart = mapValue.count("timesmart") ? (unsigned int)atoi64(mapValue["timesmart"]) : 0; |