diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-05-07 17:36:27 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-05-07 17:36:27 +0200 |
| commit | f64f59627dddd65a6a99cc057586f6460b5154e1 (patch) | |
| tree | df76e8e335fc6bb9ac6948b3f571023553dbcea7 /src/serialization | |
| parent | 97cb1c9436ec0e9f7f1468703a51596a2b8e3833 (diff) | |
| parent | e9809382109765ce53fcbd95e1fc593d9b19e184 (diff) | |
| download | monzero-core-f64f59627dddd65a6a99cc057586f6460b5154e1.tar.gz monzero-core-f64f59627dddd65a6a99cc057586f6460b5154e1.tar.xz monzero-core-f64f59627dddd65a6a99cc057586f6460b5154e1.zip | |
Merge pull request #5510
e9809382 fix wide difficulty conversion with some versions of boost (moneromooo-monero)
Diffstat (limited to 'src/serialization')
| -rw-r--r-- | src/serialization/difficulty_type.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/serialization/difficulty_type.h b/src/serialization/difficulty_type.h index e32e24b78..c551095f9 100644 --- a/src/serialization/difficulty_type.h +++ b/src/serialization/difficulty_type.h @@ -54,8 +54,8 @@ inline bool do_serialize(Archive<true>& ar, cryptonote::difficulty_type &diff) { if (!ar.stream().good()) return false; - const uint64_t hi = (diff >> 64).convert_to<uint64_t>(); - const uint64_t lo = (diff << 64 >> 64).convert_to<uint64_t>(); + const uint64_t hi = ((diff >> 64) & 0xffffffffffffffff).convert_to<uint64_t>(); + const uint64_t lo = (diff & 0xffffffffffffffff).convert_to<uint64_t>(); ar.serialize_varint(hi); ar.serialize_varint(lo); if (!ar.stream().good()) |