Browse Source

libsnark: convert 0ul to UINT64_C(0)

pull/4/head
David Mercer 8 years ago
committed by Jack Grigg
parent
commit
8a16251eda
No known key found for this signature in database GPG Key ID: 1B8D649257DB0829
  1. 8
      src/snark/libsnark/algebra/fields/tests/test_bigint.cpp
  2. 2
      src/snark/libsnark/algebra/scalar_multiplication/multiexp.tcc

8
src/snark/libsnark/algebra/fields/tests/test_bigint.cpp

@ -21,15 +21,15 @@ TEST(algebra, bigint)
const char *b2_binary = "0000000000000000000000000000010101111101101000000110100001011010"
"1101101010001001000001101000101000100110011001110001111110100010";
bigint<1> b0 = bigint<1>(0ul);
bigint<1> b0 = bigint<1>(UINT64_C(0));
bigint<1> b1 = bigint<1>(b1_decimal);
bigint<2> b2 = bigint<2>(b2_decimal);
EXPECT_EQ(b0.as_uint64(), 0ul);
EXPECT_EQ(b0.as_uint64(), UINT64_C(0));
EXPECT_TRUE(b0.is_zero());
EXPECT_EQ(b1.as_uint64(), 76749407ul);
EXPECT_EQ(b1.as_uint64(), UINT64_C(76749407));
EXPECT_FALSE(b1.is_zero());
EXPECT_EQ(b2.as_uint64(), 15747124762497195938ul);
EXPECT_EQ(b2.as_uint64(), UINT64_C(15747124762497195938));
EXPECT_FALSE(b2.is_zero());
EXPECT_NE(b0, b1);
EXPECT_FALSE(b0 == b1);

2
src/snark/libsnark/algebra/scalar_multiplication/multiexp.tcc

@ -190,7 +190,7 @@ T multi_exp_inner(typename std::vector<T>::const_iterator vec_start,
if (vec_len != odd_vec_len)
{
g.emplace_back(T::zero());
opt_q.emplace_back(ordered_exponent<n>(odd_vec_len - 1, bigint<n>(0ul)));
opt_q.emplace_back(ordered_exponent<n>(odd_vec_len - 1, bigint<n>(UINT64_C(0))));
}
assert(g.size() % 2 == 1);
assert(opt_q.size() == g.size());

Loading…
Cancel
Save