From e59755c50fb488ca0f350f3ce13d0e0e1e70712b Mon Sep 17 00:00:00 2001 From: molpopogen Date: Tue, 14 Dec 2021 13:09:14 -0800 Subject: [PATCH] Change return time of Tree::num_tracked_samples. Closes #201 --- src/trees.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/trees.rs b/src/trees.rs index b2c54815d..2dc4f71d9 100644 --- a/src/trees.rs +++ b/src/trees.rs @@ -552,9 +552,9 @@ impl Tree { /// # Errors /// /// * [`TskitError`] if [`TreeFlags::NO_SAMPLE_COUNTS`]. - pub fn num_tracked_samples(&self, u: NodeId) -> Result { - let mut n = u64::MAX; - let np: *mut u64 = &mut n; + pub fn num_tracked_samples(&self, u: NodeId) -> Result { + 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) } @@ -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); @@ -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 {