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: convert taxonomy.c to C++

Browse source 
Since the taxonomy is now a real C++ struct with constructor
and destructor, dive_site has to be converted to C++ as well.

A bit hairy for now, but will ultimately be distinctly simpler.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-04 13:39:04 +02:00 • committed by bstoeger
parent 3c1401785b
commit 3f8b4604be
39 changed files with 259 additions and 336 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/divelist.cpp
View file

@ -1144,7 +1144,7 @@ void process_imported_dives(struct divelog *import_log, int flags,
if (j == import_log->dives->nr) {
/* Dive site not even used - free it and go to next. */
free_dive_site(new_ds);
delete new_ds;
continue;
}
@ -1159,7 +1159,7 @@ void process_imported_dives(struct divelog *import_log, int flags,
if (import_log->dives->dives[j]->dive_site == new_ds)
import_log->dives->dives[j]->dive_site = old_ds;
}
free_dive_site(new_ds);
delete new_ds;
}
import_log->sites->nr = 0; /* All dive sites were consumed */