Skip to content

Commit 13f2d56

Browse files
committed
mac bb fixes
1 parent 97e5e25 commit 13f2d56

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ void AztecIVC::accumulate(ClientCircuit& circuit, const std::shared_ptr<Verifica
113113
fold_output.accumulator = prover_instance; // initialize the prover accum with the completed instance
114114

115115
// Add oink proof and corresponding verification key to the verification queue
116-
verification_queue.emplace_back(oink_prover.transcript->proof_data, instance_vk, QUEUE_TYPE::OINK);
116+
verification_queue.push_back(bb::AztecIVC::RecursiveVerifierInputs {oink_prover.transcript->proof_data, instance_vk, QUEUE_TYPE::OINK});
117117

118118
initialized = true;
119119
} else { // Otherwise, fold the new instance into the accumulator
120120
FoldingProver folding_prover({ fold_output.accumulator, prover_instance });
121121
fold_output = folding_prover.prove();
122122

123123
// Add fold proof and corresponding verification key to the verification queue
124-
verification_queue.emplace_back(fold_output.proof, instance_vk, QUEUE_TYPE::PG);
124+
verification_queue.push_back(bb::AztecIVC::RecursiveVerifierInputs {fold_output.proof, instance_vk, QUEUE_TYPE::PG});
125125
}
126126

127127
// Track the maximum size of each block for all circuits porcessed (for debugging purposes only)
@@ -201,4 +201,4 @@ bool AztecIVC::prove_and_verify()
201201
return verify(proof, { this->verifier_accumulator, verifier_inst });
202202
}
203203

204-
} // namespace bb
204+
} // namespace bb

barretenberg/cpp/src/barretenberg/crypto/merkle_tree/lmdb_store/lmdb_environment.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LMDBEnvironment::LMDBEnvironment(const std::string& directory,
1616
uint64_t totalMapSize = kb * mapSizeKB;
1717
uint32_t flags = MDB_NOTLS;
1818
try {
19-
call_lmdb_func("mdb_env_set_mapsize", mdb_env_set_mapsize, _mdbEnv, totalMapSize);
19+
call_lmdb_func("mdb_env_set_mapsize", mdb_env_set_mapsize, _mdbEnv, static_cast<size_t>(totalMapSize));
2020
call_lmdb_func("mdb_env_set_maxdbs", mdb_env_set_maxdbs, _mdbEnv, static_cast<MDB_dbi>(maxNumDBs));
2121
call_lmdb_func("mdb_env_set_maxreaders", mdb_env_set_maxreaders, _mdbEnv, maxNumReaders);
2222
call_lmdb_func("mdb_env_open",
@@ -56,4 +56,4 @@ MDB_env* LMDBEnvironment::underlying() const
5656
{
5757
return _mdbEnv;
5858
}
59-
} // namespace bb::crypto::merkle_tree
59+
} // namespace bb::crypto::merkle_tree

barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/sorted_msm.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#include <algorithm>
2+
#include <execution>
13
#include "barretenberg/ecc/scalar_multiplication/sorted_msm.hpp"
24

35
namespace bb {
@@ -215,4 +217,4 @@ template <typename Curve> void MsmSorter<Curve>::batched_affine_add_in_place(Add
215217

216218
template class MsmSorter<curve::Grumpkin>;
217219
template class MsmSorter<curve::BN254>;
218-
} // namespace bb
220+
} // namespace bb

barretenberg/cpp/src/barretenberg/honk/proof_system/permutation_library.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#pragma once
2+
#include <execution>
23
#include "barretenberg/common/ref_vector.hpp"
34
#include "barretenberg/common/zip_view.hpp"
45
#include "barretenberg/relations/relation_parameters.hpp"
@@ -197,4 +198,4 @@ void compute_translator_range_constraint_ordered_polynomials(typename Flavor::Pr
197198
[](uint32_t in) { return FF(in); });
198199
}
199200

200-
} // namespace bb
201+
} // namespace bb

0 commit comments

Comments
 (0)