diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-03-15 17:41:31 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2019-04-12 18:19:07 +0300 |
commit | 59239cec02aedda8c2651a04c65c580a9ff190a9 (patch) | |
tree | 3aa2ce298c132eb6ccacb77d5b2a508e46aa724c /core/divesite.h | |
parent | 7c63956ee4798a835794eee8189b73e3df07594d (diff) | |
download | subsurface-59239cec02aedda8c2651a04c65c580a9ff190a9.tar.gz |
Undo: make dive site merging undoable
This one was rather trivial, as there is no actual merging
done. Quite simply, a number of dive sites are removed and
their dive added to a different dive site.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/divesite.h')
-rw-r--r-- | core/divesite.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/divesite.h b/core/divesite.h index 50bd0b406..433ad056e 100644 --- a/core/divesite.h +++ b/core/divesite.h @@ -69,7 +69,6 @@ void copy_dive_site(struct dive_site *orig, struct dive_site *copy); void merge_dive_site(struct dive_site *a, struct dive_site *b); unsigned int get_distance(const location_t *loc1, const location_t *loc2); struct dive_site *find_or_create_dive_site_with_name(const char *name, struct dive_site_table *ds_table); -void merge_dive_sites(struct dive_site *ref, struct dive_site *dive_sites[], int count); void purge_empty_dive_sites(struct dive_site_table *ds_table); void clear_dive_site_table(struct dive_site_table *ds_table); void add_dive_to_dive_site(struct dive *d, struct dive_site *ds); |