diff --git a/src/httpserver.h b/src/httpserver.h index 1ef3aaeb0ab1..6e2f9ae81002 100644 --- a/src/httpserver.h +++ b/src/httpserver.h @@ -5,6 +5,8 @@ #ifndef BITCOIN_HTTPSERVER_H #define BITCOIN_HTTPSERVER_H +#include + #include #include #include @@ -140,7 +142,7 @@ class HTTPRequest */ void WriteReply(int nStatus, std::string_view reply = "") { - WriteReply(nStatus, std::as_bytes(std::span{reply})); + WriteReply(nStatus, MakeByteSpan(reply)); } void WriteReply(int nStatus, std::span reply); }; diff --git a/src/kernel/bitcoinkernel_wrapper.h b/src/kernel/bitcoinkernel_wrapper.h index 5c1b8d07eb30..109abe9f122d 100644 --- a/src/kernel/bitcoinkernel_wrapper.h +++ b/src/kernel/bitcoinkernel_wrapper.h @@ -6,6 +6,7 @@ #define BITCOIN_KERNEL_BITCOINKERNEL_WRAPPER_H #include +#include #include #include @@ -479,7 +480,7 @@ class TxidApi std::array ToBytes() const { std::array hash; - btck_txid_to_bytes(impl(), reinterpret_cast(hash.data())); + btck_txid_to_bytes(impl(), UCharCast(hash.data())); return hash; } }; @@ -680,7 +681,7 @@ class BlockHashApi std::array ToBytes() const { std::array hash; - btck_block_hash_to_bytes(impl(), reinterpret_cast(hash.data())); + btck_block_hash_to_bytes(impl(), UCharCast(hash.data())); return hash; } }; @@ -695,7 +696,7 @@ class BlockHash : public Handle& hash) - : Handle{btck_block_hash_create(reinterpret_cast(hash.data()))} {} + : Handle{btck_block_hash_create(UCharCast(hash.data()))} {} explicit BlockHash(btck_BlockHash* hash) : Handle{hash} {} diff --git a/src/kernel/chainparams.cpp b/src/kernel/chainparams.cpp index 300df95fb8ed..dc74c53a0947 100644 --- a/src/kernel/chainparams.cpp +++ b/src/kernel/chainparams.cpp @@ -16,6 +16,7 @@ #include #include