Major updates integration from all upstreams

2018-09-18 14:33:53 -07:00
parent 0c8fa56a02 0e0f5e4ea7
commit 9feb4b9e08
396 changed files with 25517 additions and 6854 deletions
--- a/src/snark/libsnark/common/utils.cpp
+++ b/src/snark/libsnark/common/utils.cpp
@@ -15,8 +15,8 @@

 namespace libsnark {

-uint64_t log2(uint64_t n)
-/* returns ceil(log2(n)), so 1ul<<log2(n) is the smallest power of 2,
+size_t log2(size_t n)
+/* returns ceil(log2(n)), so UINT64_C(1)<<log2(n) is the smallest power of 2,
   that is not less than n. */
 {
    uint64_t r = ((n & (n-1)) == 0 ? 0 : 1); // add 1 if n is not power of 2