Browse Source

Merge branch 'dev' into duke

pull/117/head
Duke Leto 4 years ago
parent
commit
52193c6a86
  1. 6
      depends/packages/native_ccache.mk
  2. 5
      src/arith_uint256.cpp

6
depends/packages/native_ccache.mk

@ -1,8 +1,8 @@
package=native_ccache
$(package)_version=3.7.7
$(package)_version=3.7.9
$(package)_download_path=https://github.com/ccache/ccache/releases/download/v$($(package)_version)
$(package)_file_name=ccache-$($(package)_version).tar.xz
$(package)_sha256_hash=b7c1d6d6fe42f18e424de92746af863e0bc85794da3d69e44300840c478c98cd
$(package)_file_name=ccache-$($(package)_version).tar.gz
$(package)_sha256_hash=92838e2133c9e704fdab9ee2608dad86c99021278b9ac47d065aa8ff2ea8ce36
define $(package)_set_vars
$(package)_config_opts=

5
src/arith_uint256.cpp

@ -193,9 +193,10 @@ unsigned int base_uint<BITS>::bits() const
{
for (int pos = WIDTH - 1; pos >= 0; pos--) {
if (pn[pos]) {
for (int bits = 31; bits > 0; bits--) {
if (pn[pos] & 1 << bits)
for (size_t bits = 31; bits > 0; bits--) {
if (pn[pos] & (1U << bits)) {
return 32 * pos + bits + 1;
}
}
return 32 * pos + 1;
}

Loading…
Cancel
Save