Skip to content

Updates for breaking changes in C API #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 14, 2021
Merged

Updates for breaking changes in C API #206

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/trees.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,9 +552,9 @@ impl Tree {
/// # Errors
///
/// * [`TskitError`] if [`TreeFlags::NO_SAMPLE_COUNTS`].
pub fn num_tracked_samples(&self, u: NodeId) -> Result<u64, TskitError> {
let mut n = u64::MAX;
let np: *mut u64 = &mut n;
pub fn num_tracked_samples(&self, u: NodeId) -> Result<SizeType, TskitError> {
let mut n = SizeType(tsk_size_t::MAX);
let np: *mut tsk_size_t = &mut n.0;
let code = unsafe { ll_bindings::tsk_tree_get_num_tracked_samples(self.as_ptr(), u.0, np) };
handle_tsk_return_value!(code, n)
}
Expand Down Expand Up @@ -1365,7 +1365,7 @@ pub(crate) mod test_trees {
assert_eq!(s.len(), 2);
assert_eq!(
s.len(),
tree.num_tracked_samples(0.into()).unwrap() as usize
usize::from(tree.num_tracked_samples(0.into()).unwrap())
);
assert_eq!(s[0], 1);
assert_eq!(s[1], 2);
Expand All @@ -1379,7 +1379,7 @@ pub(crate) mod test_trees {
assert_eq!(s[0], u);
assert_eq!(
s.len(),
tree.num_tracked_samples(u.into()).unwrap() as usize
usize::from(tree.num_tracked_samples(u.into()).unwrap())
);
}
} else {
Expand Down