diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-10-23 19:40:41 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2018-10-29 00:09:31 +0000 |
commit | 64f0902e0d78ecf9a23016f8048c4e21167b527a (patch) | |
tree | ebf9a1d6f1d2d7f643344a08ecb55f408eef323f /core/divesite.h | |
parent | f527a70831a37e736431baa5705c9d188fc12f4b (diff) | |
download | subsurface-64f0902e0d78ecf9a23016f8048c4e21167b527a.tar.gz |
Dive site: pass dive-site pointers to merge_dive_sites()
Instead of passing uuids, pass a pointer to the dive site.
This is small step in an effort to remove uuids.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/divesite.h')
-rw-r--r-- | core/divesite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/divesite.h b/core/divesite.h index 7ea7c53cc..895412a4b 100644 --- a/core/divesite.h +++ b/core/divesite.h @@ -72,7 +72,7 @@ void merge_dive_site(struct dive_site *a, struct dive_site *b); void clear_dive_site(struct dive_site *ds); 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, timestamp_t divetime); -void merge_dive_sites(uint32_t ref, uint32_t *uuids, int count); +void merge_dive_sites(struct dive_site *ref, struct dive_site *dive_sites[], int count); #ifdef __cplusplus } |