Skip to content

Commit

Permalink
fix parallel-crypto3 tests affected by clang-19
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndreyMlashkin
AndreyMlashkin committed Sep 25, 2024
1 parent bbf59e7 commit 31451a2
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions parallel-crypto3/libs/parallel-containers/include/nil/crypto3/container/merkle/tree.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,12 +397,12 @@ namespace nil {
//
template<class... Args>
reference emplace_back(Args &&..._args) {
return _hashes.template emplace_back(_args...);
return _hashes.template emplace_back<>(_args...);
}

template<class... Args>
iterator emplace(const_iterator _position, Args &&... _args) {
return _hashes.template emplace(_position, _args...);
return _hashes.template emplace<>(_position, _args...);
}

void pop_back() {
Expand All @@ -424,7 +424,7 @@ namespace nil {
void swap(merkle_tree_impl &other) {
_hashes.swap(other.hashes());
std::swap(_leaves, other.leaves());
std::swap(_rc, other.rc());
std::swap(_rc, other.row_count());
std::swap(_size, other.size());
}

Expand Down
4 changes: 2 additions & 2 deletions parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ namespace nil {

template<class... Args>
reference emplace_back(Args&&... _args) {
return val.template emplace_back(_args...);
return val.template emplace_back<>(_args...);
}

void pop_back() {
Expand All @@ -330,7 +330,7 @@ namespace nil {

template<class... Args>
iterator emplace(const_iterator _position, Args&&... _args) {
return val.template emplace(_position, _args...);
return val.template emplace<>(_position, _args...);
}

iterator insert(const_iterator _position, size_type _n, const_reference _x) {
Expand Down
4 changes: 2 additions & 2 deletions parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial_dfs.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ namespace nil {

template<class... Args>
reference emplace_back(Args&&... _args) {
return val.template emplace_back(_args...);
return val.template emplace_back<>(_args...);
}

void pop_back() {
Expand All @@ -306,7 +306,7 @@ namespace nil {
}
template<class... Args>
iterator emplace(const_iterator _position, Args&&... _args) {
return val.template emplace(_position, _args...);
return val.template emplace<>(_position, _args...);
}

iterator insert(const_iterator _position, size_type _n, const_reference _x) {
Expand Down
8 changes: 4 additions & 4 deletions ...el-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial_dfs_view.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ namespace nil {
// }

bool operator==(const polynomial_dfs_view& rhs) const {
return (*it) == (*(rhs.it)) && _d == rhs.d;
return (*it) == (*(rhs.it)) && _d == rhs.data();
}
bool operator!=(const polynomial_dfs_view& rhs) const {
return !(rhs == *this);
Expand Down Expand Up @@ -239,7 +239,7 @@ namespace nil {

template<class... Args>
reference emplace_back(Args&&... _args) {
return it.template emplace_back(_args...);
return it.template emplace_back<>(_args...);
}

void pop_back() {
Expand All @@ -255,7 +255,7 @@ namespace nil {
}
template<class... Args>
iterator emplace(const_iterator _position, Args&&... _args) {
return it.template emplace(_position, _args...);
return it.template emplace<>(_position, _args...);
}

iterator insert(const_iterator _position, size_type _n, const_reference _x) {
Expand Down Expand Up @@ -309,7 +309,7 @@ namespace nil {
// }

void swap(polynomial_dfs_view& other) {
it.swap(other.val);
it.swap(other.data());
std::swap(_d, other._d);
}

Expand Down
8 changes: 4 additions & 4 deletions parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial_view.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ namespace nil {

template<class... Args>
reference emplace_back(Args&&... _args) {
return it.template emplace_back(_args...);
return it.template emplace_back<>(_args...);
}

void pop_back() {
Expand All @@ -249,7 +249,7 @@ namespace nil {
}
template<class... Args>
iterator emplace(const_iterator _position, Args&&... _args) {
return it.template emplace(_position, _args...);
return it.template emplace<>(_position, _args...);
}

iterator insert(const_iterator _position, size_type _n, const_reference _x) {
Expand Down Expand Up @@ -286,7 +286,7 @@ namespace nil {
}

void swap(polynomial_view& other) {
it.swap(other.val);
it.swap(other.data());
}

template<typename Range>
Expand Down Expand Up @@ -408,7 +408,7 @@ namespace nil {
}
nil::crypto3::math::condense(q);

this->template assign(q.begin(), q.end());
this->template assign<>(q.begin(), q.end());
return *this;
}

Expand Down
10 changes: 5 additions & 5 deletions ...lel-zk/include/nil/crypto3/zk/snark/systems/ppzksnark/r1cs_gg_ppzksnark/ipp2/verifier.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,15 +508,15 @@ namespace nil {
pc.merge_random(a_input1.begin(), a_input1.end(), b_input1.begin(), b_input1.end(), final_res.zab);

// final_aB.0 = T = e(A,v1)e(w1,B)
a_input1.template emplace_back(proof.tmipp.gipa.final_wkey.first);
b_input1.template emplace(b_input1.begin(), proof.tmipp.gipa.final_vkey.first);
a_input1.template emplace_back<>(proof.tmipp.gipa.final_wkey.first);
b_input1.template emplace<>(b_input1.begin(), proof.tmipp.gipa.final_vkey.first);
pc.merge_random(a_input1.begin(), a_input1.end(), b_input1.begin(), b_input1.end(), final_res.tab);

// final_aB.1 = U = e(A,v2)e(w2,B)
a_input1.pop_back();
a_input1.template emplace_back(proof.tmipp.gipa.final_wkey.second);
a_input1.template emplace_back<>(proof.tmipp.gipa.final_wkey.second);
b_input1.erase(b_input1.begin());
b_input1.template emplace(b_input1.begin(), proof.tmipp.gipa.final_vkey.second);
b_input1.template emplace<>(b_input1.begin(), proof.tmipp.gipa.final_vkey.second);
pc.merge_random(a_input1.begin(), a_input1.end(), b_input1.begin(), b_input1.end(), final_res.uab);

// MIPP
Expand All @@ -536,7 +536,7 @@ namespace nil {

// U = e(A,v2)
b_input2.pop_back();
b_input2.template emplace_back(proof.tmipp.gipa.final_vkey.second);
b_input2.template emplace_back<>(proof.tmipp.gipa.final_vkey.second);
pc.merge_random(a_input2.begin(), a_input2.end(), b_input2.begin(), b_input2.end(), final_res.uc);

if (final_z != final_res.zc) {
Expand Down

0 comments on commit 31451a2

Please sign in to comment.