Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-01-07 11:37:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix clang compile errors

Browse Source
This commit is contained in:
j-berman 2024-08-08 14:55:49 -07:00
parent d4847f649e
commit 9f0dd859e6
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/blockchain_utilities/CMakeLists.txt
View File

@ -141,7 +141,6 @@ target_link_libraries(blockchain_import
PRIVATE
cryptonote_core
blockchain_db
fcmp_pp
version
epee
${Boost_FILESYSTEM_LIBRARY}

21
src/fcmp_pp/curve_trees.cpp
View File

@ -761,6 +761,10 @@ std::vector<typename C2::Scalar> CurveTrees<C1, C2>::flatten_leaves(std::vector<
return flattened_leaves;
};
// Explicit instantiation
template std::vector<Selene::Scalar> CurveTrees<Helios, Selene>::flatten_leaves(
std::vector<LeafTuple> &&leaves) const;
//----------------------------------------------------------------------------------------------------------------------
template<typename C1, typename C2>
typename CurveTrees<C1, C2>::TreeExtension CurveTrees<C1, C2>::get_tree_extension(
@ -854,6 +858,12 @@ typename CurveTrees<C1, C2>::TreeExtension CurveTrees<C1, C2>::get_tree_extensio
return tree_extension;
};
// Explicit instantiation
template CurveTrees<Helios, Selene>::TreeExtension CurveTrees<Helios, Selene>::get_tree_extension(
const uint64_t old_n_leaf_tuples,
const LastHashes &existing_last_hashes,
std::vector<LeafTupleContext> &&new_leaf_tuples) const;
//----------------------------------------------------------------------------------------------------------------------
template<typename C1, typename C2>
std::vector<TrimLayerInstructions> CurveTrees<C1, C2>::get_trim_instructions(
@ -899,6 +909,11 @@ std::vector<TrimLayerInstructions> CurveTrees<C1, C2>::get_trim_instructions(
return trim_instructions;
}
// Explicit instantiation
template std::vector<TrimLayerInstructions> CurveTrees<Helios, Selene>::get_trim_instructions(
const uint64_t old_n_leaf_tuples,
const uint64_t trim_n_leaf_tuples) const;
//----------------------------------------------------------------------------------------------------------------------
template<typename C1, typename C2>
typename CurveTrees<C1, C2>::TreeReduction CurveTrees<C1, C2>::get_tree_reduction(
@ -962,6 +977,12 @@ typename CurveTrees<C1, C2>::TreeReduction CurveTrees<C1, C2>::get_tree_reductio
return tree_reduction_out;
};
// Explicit instantiation
template CurveTrees<Helios, Selene>::TreeReduction CurveTrees<Helios, Selene>::get_tree_reduction(
const std::vector<TrimLayerInstructions> &trim_instructions,
const LastChunkChildrenToTrim &children_to_trim,
const LastHashes &last_hashes) const;
//----------------------------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------------------------
// CurveTrees private member functions

2
tests/unit_tests/serialization.cpp
View File

@ -1312,7 +1312,7 @@ TEST(Serialization, tx_fcmp_pp)
const std::size_t n_inputs = 2;
const std::size_t n_outputs = 3;
const auto make_dummy_fcmp_pp_tx = [n_inputs, n_outputs]() -> transaction
const auto make_dummy_fcmp_pp_tx = []() -> transaction
{
transaction tx;