diff options
| author | fanquake <fanquake@gmail.com> | 2023-08-22 14:27:52 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-08-22 14:46:10 +0100 |
| commit | 03a536f1ed9832c74171a00c920c523ce3927f90 (patch) | |
| tree | fca9cae6c4137a67c0629ea19652fdb28d5a7352 /src/script/solver.cpp | |
| parent | 38db2bd4e144065c515a222e1ae3d4ca7677e428 (diff) | |
| parent | fadf671fa539e76d000a08b92109ea5503d5f3ac (diff) | |
Merge bitcoin/bitcoin#28284: refactor: Remove confusing static_cast in address types
fadf671fa539e76d000a08b92109ea5503d5f3ac Refactor: Remove confusing static_cast (MarcoFalke)
faeea1ab586e30ca3b980999a264f2a3b4769143 refactor: Add missing includes (MarcoFalke)
Pull request description:
It seems confusing to use `static_cast<uint160>(bla)` to call the constructor of `uint160`. The normal and common way to call a constructor is by simply calling it. (`uint160{bla}`).
Do this, and also drop the constructor completely where the existing `const&` reference is enough.
Also, add missing includes while touching the file.
ACKs for top commit:
vincenzopalazzo:
ACK https://github.com/bitcoin/bitcoin/pull/28284/commits/fadf671fa539e76d000a08b92109ea5503d5f3ac
TheCharlatan:
ACK fadf671fa539e76d000a08b92109ea5503d5f3ac
Tree-SHA512: 8fb9a72203a6461b1f4b38bb90943ca25a92b218fc87da2022b90802e7747350e3668a13db3189201ad30e2e39a51d6658fed4aad176fd52cecc1c7f972c3134
Diffstat (limited to 'src/script/solver.cpp')
| -rw-r--r-- | src/script/solver.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/script/solver.cpp b/src/script/solver.cpp index 1cd388b061..3dfa9cd6ba 100644 --- a/src/script/solver.cpp +++ b/src/script/solver.cpp @@ -3,14 +3,15 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include <script/solver.h> #include <pubkey.h> #include <script/interpreter.h> #include <script/script.h> +#include <script/solver.h> #include <span.h> -#include <string> #include <algorithm> +#include <cassert> +#include <string> typedef std::vector<unsigned char> valtype; |