mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-19 13:27:35 +02:00
Merge 30e8a79aef into merged_master (Bitcoin PR bitcoin/bitcoin#30482)
This commit is contained in:
commit
985fd76510
16 changed files with 98 additions and 82 deletions
|
|
@ -25,7 +25,7 @@ std::string base_blob<BITS>::GetHex() const
|
|||
}
|
||||
|
||||
template <unsigned int BITS>
|
||||
void base_blob<BITS>::SetHex(const std::string_view str)
|
||||
void base_blob<BITS>::SetHexDeprecated(const std::string_view str)
|
||||
{
|
||||
std::fill(m_data.begin(), m_data.end(), 0);
|
||||
|
||||
|
|
@ -60,13 +60,13 @@ std::string base_blob<BITS>::ToString() const
|
|||
template base_blob<160>::base_blob(const unsigned char*, size_t);
|
||||
template std::string base_blob<160>::GetHex() const;
|
||||
template std::string base_blob<160>::ToString() const;
|
||||
template void base_blob<160>::SetHex(std::string_view);
|
||||
template void base_blob<160>::SetHexDeprecated(std::string_view);
|
||||
|
||||
// Explicit instantiations for base_blob<256>
|
||||
template base_blob<256>::base_blob(const unsigned char*, size_t);
|
||||
template std::string base_blob<256>::GetHex() const;
|
||||
template std::string base_blob<256>::ToString() const;
|
||||
template void base_blob<256>::SetHex(std::string_view);
|
||||
template void base_blob<256>::SetHexDeprecated(std::string_view);
|
||||
|
||||
const uint256 uint256::ZERO(0);
|
||||
const uint256 uint256::ONE(1);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue