Skip to content

Commit

Permalink
Merge branch 'master' into ci-test
Browse files Browse the repository at this point in the history
  • Loading branch information
michalsta committed Sep 23, 2024
2 parents e61e164 + 7e14412 commit 232187f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion opentims++/opentims.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ TimsFrame TimsFrame::TimsFrameFromSql(char** sql_row, TimsDataHandle& parent_han
atol(sql_row[3]),
100.0 / atof(sql_row[4]),
atof(sql_row[5]),
std::strtoul(sql_row[6], nullptr, 10) + parent_handle.tims_data_bin.data(),
std::strtoull(sql_row[6], nullptr, 10) + parent_handle.tims_data_bin.data(),
parent_handle
);
}
Expand Down

0 comments on commit 232187f

Please sign in to comment.