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: remove dive_site member from merge_result

Browse source 
All callers were just using that member to set the dive_site
in the resulting dive. We might just do that in the called
function [merge_dives()].

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-08-31 09:38:37 +02:00 • committed by Michael Keller
parent 5b46d8cc33
commit 27a89b0232
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/divelist.h
View file

@ -18,7 +18,6 @@ int comp_dives_ptr(const struct dive *a, const struct dive *b);
struct merge_result {
std::unique_ptr<struct dive> dive;
dive_trip *trip;
dive_site *site;
};
struct dive_table : public sorted_owning_table<dive, &comp_dives> {