mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: make get_surface_interval() member of dive_table

Browse source 
This function implicitely accessed the global divelog. To make
that explicit make it a member of dive_table, such that the
caller must access it via the global variable.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-06-18 21:01:16 +02:00 • committed by bstoeger
parent e9a57ac5f5
commit cce5f5950c
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/divelist.cpp
View file

@ -1270,17 +1270,15 @@ bool dive_or_trip_less_than(struct dive_or_trip a, struct dive_or_trip b)
* that happened inside other dives. The interval will always be calculated
* with respect to the dive that started previously.
*/
timestamp_t get_surface_interval(timestamp_t when)
timestamp_t dive_table::get_surface_interval(timestamp_t when) const
{
timestamp_t prev_end;
/* find previous dive. might want to use a binary search. */
auto it = std::find_if(divelog.dives.rbegin(), divelog.dives.rend(),
auto it = std::find_if(rbegin(), rend(),
[when] (auto &d) { return d->when < when; });
if (it == divelog.dives.rend())
if (it == rend())
return -1;
prev_end = (*it)->endtime();
timestamp_t prev_end = (*it)->endtime();
if (prev_end > when)
return 0;
return when - prev_end;