diff options
| author | practicalswift <[email protected]> | 2017-08-07 07:36:37 +0200 |
|---|---|---|
| committer | practicalswift <[email protected]> | 2017-08-07 07:36:37 +0200 |
| commit | 90d4d89230434493c3b1e9174abed2609ba74cf1 (patch) | |
| tree | 511237508ac27f66846c0aa9405658b835c9ae43 /src/consensus/merkle.cpp | |
| parent | Merge #10988: qt: Increase BLOCK_CHAIN_SIZE constants (diff) | |
| download | discoin-90d4d89230434493c3b1e9174abed2609ba74cf1.tar.xz discoin-90d4d89230434493c3b1e9174abed2609ba74cf1.zip | |
scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL
-BEGIN VERIFY SCRIPT-
sed -i 's/\<NULL\>/nullptr/g' src/*.cpp src/*.h src/*/*.cpp src/*/*.h src/qt/*/*.cpp src/qt/*/*.h src/wallet/*/*.cpp src/wallet/*/*.h src/support/allocators/*.h
sed -i 's/Prefer nullptr, otherwise SAFECOOKIE./Prefer NULL, otherwise SAFECOOKIE./g' src/torcontrol.cpp
sed -i 's/tor: Using nullptr authentication/tor: Using NULL authentication/g' src/torcontrol.cpp
sed -i 's/METHODS=nullptr/METHODS=NULL/g' src/test/torcontrol_tests.cpp src/torcontrol.cpp
sed -i 's/nullptr certificates/NULL certificates/g' src/qt/paymentserver.cpp
sed -i 's/"nullptr"/"NULL"/g' src/torcontrol.cpp src/test/torcontrol_tests.cpp
-END VERIFY SCRIPT-
Diffstat (limited to 'src/consensus/merkle.cpp')
| -rw-r--r-- | src/consensus/merkle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/consensus/merkle.cpp b/src/consensus/merkle.cpp index 1ce5a9d87..798ce4b5f 100644 --- a/src/consensus/merkle.cpp +++ b/src/consensus/merkle.cpp @@ -132,13 +132,13 @@ static void MerkleComputation(const std::vector<uint256>& leaves, uint256* proot uint256 ComputeMerkleRoot(const std::vector<uint256>& leaves, bool* mutated) { uint256 hash; - MerkleComputation(leaves, &hash, mutated, -1, NULL); + MerkleComputation(leaves, &hash, mutated, -1, nullptr); return hash; } std::vector<uint256> ComputeMerkleBranch(const std::vector<uint256>& leaves, uint32_t position) { std::vector<uint256> ret; - MerkleComputation(leaves, NULL, NULL, position, &ret); + MerkleComputation(leaves, nullptr, nullptr, position, &ret); return ret; } |