diff options
| author | merge-script <fanquake@gmail.com> | 2024-05-03 10:47:37 +0800 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-05-03 10:47:37 +0800 |
| commit | 5127844cabbe50236abc8d55015692515c49315e (patch) | |
| tree | c4ebbf5aac7b7a5c4c2a6c662e863e398c8ffded /src/test | |
| parent | 62ef33a718c9891d37d7c757968876033c4f794d (diff) | |
| parent | b50d127a7710d790c2ba4a08f01b832c2a0b1203 (diff) | |
| download | bitcoin-5127844cabbe50236abc8d55015692515c49315e.tar.xz | |
Merge bitcoin/bitcoin#30017: refactor, fuzz: Make 64-bit shift explicit
b50d127a7710d790c2ba4a08f01b832c2a0b1203 refactor: Make 64-bit shift explicit (Hennadii Stepanov)
Pull request description:
This PR fixes MSVC warning [C4334](https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4334) in the fuzzing code. Similar to https://github.com/bitcoin/bitcoin/pull/26252.
All `DisableSpecificWarnings` dropped from `fuzz.vcxproj` as all remained are inherited from `common.init.vcxproj`.
Required to simplify warning suppression porting to the CMake-based build system.
ACKs for top commit:
maflcko:
utACK b50d127a7710d790c2ba4a08f01b832c2a0b1203
sipsorcery:
utACK b50d127a7710d790c2ba4a08f01b832c2a0b1203
Tree-SHA512: 18f6082b4234506ad2f9df54e577031b97cdf9f7ef64cad4162f275660716ab73587a97d3af0f778dfd48d2751d8676b5d3381d0aa837fcc60a09704473a9209
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/fuzz/poolresource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/fuzz/poolresource.cpp b/src/test/fuzz/poolresource.cpp index ce64ef6472..f764d9f8db 100644 --- a/src/test/fuzz/poolresource.cpp +++ b/src/test/fuzz/poolresource.cpp @@ -63,9 +63,9 @@ public: { if (m_total_allocated > 0x1000000) return; size_t alignment_bits = m_provider.ConsumeIntegralInRange<size_t>(0, 7); - size_t alignment = 1 << alignment_bits; + size_t alignment = size_t{1} << alignment_bits; size_t size_bits = m_provider.ConsumeIntegralInRange<size_t>(0, 16 - alignment_bits); - size_t size = m_provider.ConsumeIntegralInRange<size_t>(1U << size_bits, (1U << (size_bits + 1)) - 1U) << alignment_bits; + size_t size = m_provider.ConsumeIntegralInRange<size_t>(size_t{1} << size_bits, (size_t{1} << (size_bits + 1)) - 1U) << alignment_bits; Allocate(size, alignment); } |