From 8a16251eda963de07d04a0fe7d1123c25ae6b2a7 Mon Sep 17 00:00:00 2001 From: David Mercer Date: Wed, 11 Jan 2017 19:54:20 -0700 Subject: [PATCH] libsnark: convert 0ul to UINT64_C(0) --- src/snark/libsnark/algebra/fields/tests/test_bigint.cpp | 8 ++++---- .../libsnark/algebra/scalar_multiplication/multiexp.tcc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/snark/libsnark/algebra/fields/tests/test_bigint.cpp b/src/snark/libsnark/algebra/fields/tests/test_bigint.cpp index 731403ec7..11a799ff0 100644 --- a/src/snark/libsnark/algebra/fields/tests/test_bigint.cpp +++ b/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); diff --git a/src/snark/libsnark/algebra/scalar_multiplication/multiexp.tcc b/src/snark/libsnark/algebra/scalar_multiplication/multiexp.tcc index da59e2f21..080e4cf23 100644 --- a/src/snark/libsnark/algebra/scalar_multiplication/multiexp.tcc +++ b/src/snark/libsnark/algebra/scalar_multiplication/multiexp.tcc @@ -190,7 +190,7 @@ T multi_exp_inner(typename std::vector::const_iterator vec_start, if (vec_len != odd_vec_len) { g.emplace_back(T::zero()); - opt_q.emplace_back(ordered_exponent(odd_vec_len - 1, bigint(0ul))); + opt_q.emplace_back(ordered_exponent(odd_vec_len - 1, bigint(UINT64_C(0)))); } assert(g.size() % 2 == 1); assert(opt_q.size() == g.size());