Browse Source

Fix linux compilation. Now works for both linux and windows.

pull/94/head
FireMartZ 6 years ago
parent
commit
033626dac9
  1. 2
      src/snark/src/algebra/curves/alt_bn128/alt_bn128_g1.hpp
  2. 2
      src/snark/src/algebra/curves/alt_bn128/alt_bn128_g2.hpp
  3. 6
      src/snark/src/algebra/fields/fp.hpp
  4. 2
      src/snark/src/common/profiling.cpp
  5. 2
      src/snark/src/common/utils.hpp
  6. 2
      src/snark/src/common/utils.tcc

2
src/snark/src/algebra/curves/alt_bn128/alt_bn128_g1.hpp

@ -63,7 +63,7 @@ public:
static alt_bn128_G1 one();
static alt_bn128_G1 random_element();
static size_t size_in_bits() { return base_field::size_in_bits() + 1; }
static unsigned long long size_in_bits() { return base_field::size_in_bits() + 1; }
static bigint<base_field::num_limbs> base_field_char() { return base_field::field_char(); }
static bigint<scalar_field::num_limbs> order() { return scalar_field::field_char(); }

2
src/snark/src/algebra/curves/alt_bn128/alt_bn128_g2.hpp

@ -67,7 +67,7 @@ public:
static alt_bn128_G2 one();
static alt_bn128_G2 random_element();
static size_t size_in_bits() { return twist_field::size_in_bits() + 1; }
static unsigned long long size_in_bits() { return twist_field::size_in_bits() + 1; }
static bigint<base_field::num_limbs> base_field_char() { return base_field::field_char(); }
static bigint<scalar_field::num_limbs> order() { return scalar_field::field_char(); }

6
src/snark/src/algebra/fields/fp.hpp

@ -50,9 +50,9 @@ public:
static int64_t sqr_cnt;
static int64_t inv_cnt;
#endif
static size_t num_bits;
static unsigned long long num_bits;
static bigint<n> euler; // (modulus-1)/2
static size_t s; // modulus = 2^s * t + 1
static unsigned long long s; // modulus = 2^s * t + 1
static bigint<n> t; // with t odd
static bigint<n> t_minus_1_over_2; // (t-1)/2
static Fp_model<n, modulus> nqr; // a quadratic nonresidue
@ -107,7 +107,7 @@ public:
Fp_model inverse() const;
Fp_model sqrt() const; // HAS TO BE A SQUARE (else does not terminate)
Fp_model operator^(const unsigned long long pow) const;
Fp_model operator^(const uint64_t pow) const;
template<mp_size_t m>
Fp_model operator^(const bigint<m> &pow) const;

2
src/snark/src/common/profiling.cpp

@ -35,7 +35,7 @@
namespace libsnark {
long long get_nsec_time()
int64_t get_nsec_time()
{
auto timepoint = std::chrono::high_resolution_clock::now();
return std::chrono::duration_cast<std::chrono::nanoseconds>(timepoint.time_since_epoch()).count();

2
src/snark/src/common/utils.hpp

@ -27,7 +27,7 @@ inline unsigned long long exp2(unsigned long long k) { return 1ull << k; }
unsigned long long bitreverse(unsigned long long n, const unsigned long long l);
bit_vector int_list_to_bits(const std::initializer_list<unsigned long long> &l, const unsigned long long wordsize);
long long div_ceil(long long x, long long y);
int64_t div_ceil(int64_t x, int64_t y);
bool is_little_endian();

2
src/snark/src/common/utils.tcc

@ -13,7 +13,7 @@
namespace libsnark {
template<typename T>
size_t size_in_bits(const std::vector<T> &v)
unsigned long long size_in_bits(const std::vector<T> &v)
{
return v.size() * T::size_in_bits();
}

Loading…
Cancel
Save