Skip to content

Commit 5699aab

Browse files
authored
Change return time of Tree::num_tracked_samples. (#206)
Closes #201
1 parent 2391c9e commit 5699aab

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/trees.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -552,9 +552,9 @@ impl Tree {
552552
/// # Errors
553553
///
554554
/// * [`TskitError`] if [`TreeFlags::NO_SAMPLE_COUNTS`].
555-
pub fn num_tracked_samples(&self, u: NodeId) -> Result<u64, TskitError> {
556-
let mut n = u64::MAX;
557-
let np: *mut u64 = &mut n;
555+
pub fn num_tracked_samples(&self, u: NodeId) -> Result<SizeType, TskitError> {
556+
let mut n = SizeType(tsk_size_t::MAX);
557+
let np: *mut tsk_size_t = &mut n.0;
558558
let code = unsafe { ll_bindings::tsk_tree_get_num_tracked_samples(self.as_ptr(), u.0, np) };
559559
handle_tsk_return_value!(code, n)
560560
}
@@ -1365,7 +1365,7 @@ pub(crate) mod test_trees {
13651365
assert_eq!(s.len(), 2);
13661366
assert_eq!(
13671367
s.len(),
1368-
tree.num_tracked_samples(0.into()).unwrap() as usize
1368+
usize::from(tree.num_tracked_samples(0.into()).unwrap())
13691369
);
13701370
assert_eq!(s[0], 1);
13711371
assert_eq!(s[1], 2);
@@ -1379,7 +1379,7 @@ pub(crate) mod test_trees {
13791379
assert_eq!(s[0], u);
13801380
assert_eq!(
13811381
s.len(),
1382-
tree.num_tracked_samples(u.into()).unwrap() as usize
1382+
usize::from(tree.num_tracked_samples(u.into()).unwrap())
13831383
);
13841384
}
13851385
} else {

0 commit comments

Comments
 (0)