@@ -619,9 +619,9 @@ macro_rules! node_table_add_row_details {
619
619
$crate:: bindings:: tsk_node_table_add_row(
620
620
& mut $table,
621
621
$flags. into( ) . bits( ) ,
622
- $time. into( ) . 0 ,
623
- $population. into( ) . 0 ,
624
- $individual. into( ) . 0 ,
622
+ $time. into( ) . into ( ) ,
623
+ $population. into( ) . into ( ) ,
624
+ $individual. into( ) . into ( ) ,
625
625
$metadata,
626
626
$metadata_len,
627
627
)
@@ -699,10 +699,10 @@ macro_rules! edge_table_add_row_details {
699
699
let rv = unsafe {
700
700
$crate:: bindings:: tsk_edge_table_add_row(
701
701
& mut $table,
702
- $left. into( ) . 0 ,
703
- $right. into( ) . 0 ,
704
- $parent. into( ) . 0 ,
705
- $child. into( ) . 0 ,
702
+ $left. into( ) . into ( ) ,
703
+ $right. into( ) . into ( ) ,
704
+ $parent. into( ) . into ( ) ,
705
+ $child. into( ) . into ( ) ,
706
706
$metadata,
707
707
$metadata_len,
708
708
)
@@ -882,10 +882,10 @@ macro_rules! mutation_table_add_row_details {
882
882
let rv = unsafe {
883
883
$crate:: bindings:: tsk_mutation_table_add_row(
884
884
& mut $table,
885
- $site. into( ) . 0 ,
886
- $node. into( ) . 0 ,
887
- $parent. into( ) . 0 ,
888
- $time. into( ) . 0 ,
885
+ $site. into( ) . into ( ) ,
886
+ $node. into( ) . into ( ) ,
887
+ $parent. into( ) . into ( ) ,
888
+ $time. into( ) . into ( ) ,
889
889
dstate. 0 ,
890
890
dstate. 1 ,
891
891
$metadata,
@@ -963,7 +963,7 @@ macro_rules! site_table_add_row_details {
963
963
let rv = unsafe {
964
964
$crate:: bindings:: tsk_site_table_add_row(
965
965
& mut $table,
966
- $position. into( ) . 0 ,
966
+ $position. into( ) . into ( ) ,
967
967
astate. 0 ,
968
968
astate. 1 ,
969
969
$metadata,
@@ -1020,12 +1020,12 @@ macro_rules! migration_table_add_row_details {
1020
1020
let rv = unsafe {
1021
1021
$crate:: bindings:: tsk_migration_table_add_row(
1022
1022
& mut $table,
1023
- $span. 0 . into( ) . 0 ,
1024
- $span. 1 . into( ) . 0 ,
1025
- $node. into( ) . 0 ,
1026
- $source_dest. 0 . into( ) . 0 ,
1027
- $source_dest. 1 . into( ) . 0 ,
1028
- $time. into( ) . 0 ,
1023
+ $span. 0 . into( ) . into ( ) ,
1024
+ $span. 1 . into( ) . into ( ) ,
1025
+ $node. into( ) . into ( ) ,
1026
+ $source_dest. 0 . into( ) . into ( ) ,
1027
+ $source_dest. 1 . into( ) . into ( ) ,
1028
+ $time. into( ) . into ( ) ,
1029
1029
$metadata,
1030
1030
$metadata_len,
1031
1031
)
@@ -1136,7 +1136,7 @@ macro_rules! raw_metadata_getter_for_tables {
1136
1136
self ,
1137
1137
self . as_ref( ) . metadata,
1138
1138
self . as_ref( ) . metadata_offset,
1139
- row. 0 ,
1139
+ row. into ( ) ,
1140
1140
self . num_rows( ) . into( ) ,
1141
1141
self . as_ref( ) . metadata_length,
1142
1142
)
0 commit comments