From d36b6fe96fcd99e06f6cbb13db7bd92dba1b778f Mon Sep 17 00:00:00 2001 From: j-berman Date: Fri, 26 Jul 2024 12:44:10 -0700 Subject: [PATCH] resolve rebase to master issues --- src/fcmp/fcmp_rust/fcmp++.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/fcmp/fcmp_rust/fcmp++.h b/src/fcmp/fcmp_rust/fcmp++.h index 2648d3c7f..f1ef5c17c 100644 --- a/src/fcmp/fcmp_rust/fcmp++.h +++ b/src/fcmp/fcmp_rust/fcmp++.h @@ -115,12 +115,17 @@ CResult hash_grow_helios(HeliosPoint existing_hash, HeliosScalar existing_child_at_offset, HeliosScalarSlice new_children); +CResult hash_trim_helios(HeliosPoint existing_hash, + uintptr_t offset, + HeliosScalarSlice children, + HeliosScalar child_to_grow_back); + CResult hash_grow_selene(SelenePoint existing_hash, uintptr_t offset, SeleneScalar existing_child_at_offset, SeleneScalarSlice new_children); -CResult hash_trim_selene(SelenePoint existing_hash, +CResult hash_trim_selene(SelenePoint existing_hash, uintptr_t offset, SeleneScalarSlice children, SeleneScalar child_to_grow_back);