Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/sys/edge_table.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::ffi::c_char;
use std::ptr::NonNull;

use super::newtypes::EdgeId;
Expand Down Expand Up @@ -64,7 +65,7 @@ impl EdgeTable {
right,
parent,
child,
metadata.as_ptr().cast::<i8>(),
metadata.as_ptr().cast::<c_char>(),
metadata.len() as u64,
))
}
Expand Down
3 changes: 2 additions & 1 deletion src/sys/individual_table.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::ffi::c_char;
use std::ptr::NonNull;

use super::bindings::tsk_size_t;
Expand Down Expand Up @@ -65,7 +66,7 @@ impl IndividualTable {
location.len() as u64,
parents.as_ptr(),
parents.len() as u64,
metadata.as_ptr().cast::<i8>(),
metadata.as_ptr().cast::<c_char>(),
metadata.len() as u64,
))
}
Expand Down
3 changes: 2 additions & 1 deletion src/sys/migration_table.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::ffi::c_char;
use std::ptr::NonNull;

use super::newtypes::MigrationId;
Expand Down Expand Up @@ -71,7 +72,7 @@ impl MigrationTable {
source,
dest,
time,
metadata.as_ptr().cast::<i8>(),
metadata.as_ptr().cast::<c_char>(),
metadata.len() as u64,
))
}
Expand Down
5 changes: 3 additions & 2 deletions src/sys/mutation_table.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::ffi::c_char;
use std::ptr::NonNull;

use super::newtypes::MutationId;
Expand Down Expand Up @@ -70,14 +71,14 @@ impl MutationTable {
parent,
time,
match derived_state {
Some(d) => d.as_ptr() as *const i8,
Some(d) => d.as_ptr() as *const c_char,
None => std::ptr::null(),
},
match derived_state {
Some(d) => d.len() as u64,
None => 0,
},
metadata.as_ptr().cast::<i8>(),
metadata.as_ptr().cast::<c_char>(),
metadata.len() as u64,
))
}
Expand Down
3 changes: 2 additions & 1 deletion src/sys/node_table.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::ffi::c_char;
use std::ptr::NonNull;

use super::flags::NodeFlags;
Expand Down Expand Up @@ -80,7 +81,7 @@ impl NodeTable {
time.into().into(),
population.into().into(),
individual.into().into(),
metadata.as_ptr().cast::<i8>(),
metadata.as_ptr().cast::<c_char>(),
metadata.len() as u64,
)
} {
Expand Down
3 changes: 2 additions & 1 deletion src/sys/population_table.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::ffi::c_char;
use std::ptr::NonNull;

use super::bindings::tsk_id_t;
Expand Down Expand Up @@ -44,7 +45,7 @@ impl PopulationTable {
unsafe {
Ok(tsk_population_table_add_row(
self.as_mut(),
metadata.as_ptr().cast::<i8>(),
metadata.as_ptr().cast::<c_char>(),
metadata.len() as u64,
))
}
Expand Down
5 changes: 3 additions & 2 deletions src/sys/site_table.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::ffi::c_char;
use std::ptr::NonNull;

use super::bindings::tsk_size_t;
Expand Down Expand Up @@ -58,14 +59,14 @@ impl SiteTable {
self.as_mut(),
position,
match ancestral_state {
Some(d) => d.as_ptr() as *const i8,
Some(d) => d.as_ptr() as *const c_char,
None => std::ptr::null(),
},
match ancestral_state {
Some(d) => d.len() as u64,
None => 0,
},
metadata.as_ptr().cast::<i8>(),
metadata.as_ptr().cast::<c_char>(),
metadata.len() as u64,
))
}
Expand Down
Loading